diff --git a/Contents b/Contents
index 2a884ab..7c90450 100644
--- a/Contents
+++ b/Contents
@@ -5,32 +5,38 @@ app_service
 Application execution service.
 
 
-assembly
-An extensible framework for genome assembly.
-
-
-awe_tools
-admin tools for awe
+genome_annotation
 
 
-genome_annotation
+p3_auth
+authentication
 
 
-handle_service
-An application programming interface for managing files. This service
-provides an AbstractHandle that can be used to reference data in different
-stores. This deploys both the client and service.
+p3_code
+SEEDtk Fragment Shared with PATRIC
 
 
-p3_auth
-authentication
+p3_core
+Core library modules & scripts for PATRIC API integration
 
 
 p3_deployment
 Deployment tools for PATRIC.
 
 
-p3_seed
+seed_core
+Core code exported from SEED CVS.
+
+
+seed_gjo
+Gary Olsen code exported from SEED CVS
+
+
+seed_rast
+RAST related code exported from SEED CVS
+
+
+seed_svr
 
 
 typecomp
diff --git a/Manifest b/Manifest
index c7199c0..7c71638 100644
--- a/Manifest
+++ b/Manifest
@@ -1,11 +1,13 @@
 Workspace	df04f91ab52281da4dec491c847db0dfc2e14415	olsonanl/Workspace
-app_service	f5f6f368175ffb499476c8b11939c788ee0ea745	olsonanl/app_service
-assembly	6bcecac2ba7de826d2a4625964b02c348e7ce4e9	olsonanl/assembly
-awe_tools	1c68fbb660614bd78dc9b5f6be0c0ccd5420df2a	olsonanl/awe_tools
-genome_annotation	9288b249b199a45c531fc47060081be52b4d6151	olsonanl/genome_annotation
-handle_service	76ec1dedf5c3ede31ea1435864c02eedaacd5f1c	olsonanl/handle_service
-p3_auth	7f5ef08031802625b4486de25e413e8009e8c30e	olsonanl/p3_auth
+app_service	7303cd28f8f2aadda79ef1722e705def240de289	olsonanl/app_service
+genome_annotation	d4509a6d6f9e9f13f908a28f2702c1e0e102c480	olsonanl/genome_annotation
+p3_auth	0ff8139408bf764676aebc8075a289f5a2e4f92c	olsonanl/p3_auth
+p3_code	7594936fe218bf11902757e4d7e14fbab89d8c02	olsonanl/p3_code
+p3_core	807536d6b1a56f6fe9ae743aed385b5fe31418fe	PATRIC3/p3_core
 p3_deployment	1e48f035e99543198897bd52d7664990f2a27b5a	olsonanl/p3_deployment
-p3_seed	48a4a73f2659a0db75fb6a7169312ff974a415fe	olsonanl/p3_seed
-typecomp	87d655c4053d4d19086f0c27e70f5ec7868b99c3	olsonanl/typecomp
-dev_container	a1df36790aaf69551ad2f65399742ff262b8186a	olsonanl/dev_container
+seed_core	db240db278c8b6eb26bd81cbc3800f43c5c7a901	theseed/seed_core
+seed_gjo	f368966662bd95668e1843d53f4e8413a82451a9	theseed/seed_gjo
+seed_rast	66959f8611494fd75593911fb5d9579b8bfbce14	theseed/seed_rast
+seed_svr	c3006abd9c38e166f5a75deca65ae648fecbb0e0	theseed/seed_svr
+typecomp	cbd2afa26f06098169854ba31e5fcb0ae1e768c2	olsonanl/typecomp
+dev_container	0f94b9d3a05eb6fbd3d8b9cd8d648481c388b595	olsonanl/dev_container
diff --git a/distro.cfg b/distro.cfg
index cc6c6df..afaa80d 100644
--- a/distro.cfg
+++ b/distro.cfg
@@ -4,7 +4,7 @@
 target = [% target %]
 deploy-runtime = [% runtime %]
 
-deploy-client = genome_annotation, p3_deployment, typecomp, Workspace, app_service, p3_seed, handle_service, awe_tools, p3_auth, assembly
+deploy-client = genome_annotation, p3_deployment, typecomp, Workspace, app_service, p3_code, p3_core, seed_core, seed_gjo, seed_svr, seed_rast, p3_auth
 deploy-service =
 ;deploy-master = auth
 
@@ -14,11 +14,6 @@ source-repo = olsonanl/dev_container
 [p3_deployment]
 source-repo = olsonanl/p3_deployment
 
-[awe_tools]
-source-repo = olsonanl/awe_tools
-awe-url = [% awe_url %]
-shock-url = [% shock_url %]
-
 [app_service]
 source-repo = olsonanl/app_service
 ;source-repo = TheSEED/app_service
@@ -43,28 +38,24 @@ nr-annotation-directory = /disks/kb/data/NR
 [p3_auth]
 source-repo = olsonanl/p3_auth
 
-[p3_seed]
-source-repo = olsonanl/p3_seed
+[p3_code]
+source-repo = olsonanl/p3_code
+
+[p3_core]
+source-repo = PATRIC3/p3_core
+
+[seed_svr]
+source-repo = theseed/seed_svr
 
-[kmer_annotation_figfam]
+[seed_core]
+source-repo = theseed/seed_core
 
-_service_name = KmerAnnotationByFigfam
-kmer-data = /disks/kb/data/FIGfams
-#kmer-ftp-site = ftp://ftp.theseed.org/misc/tmp
-service-url = [% kmer_annotation_url %]
+[seed_gjo]
+source-repo = theseed/seed_gjo
+
+[seed_rast]
+source-repo = theseed/seed_rast
 
 [typecomp]
 source-repo = olsonanl/typecomp
 
-[assembly]
-arast-url=http://tutorial.theseed.org/assembly
-arast-auth-service = RAST
-source-repo = olsonanl/assembly
-
-[handle_service]
-source-repo = olsonanl/handle_service
-self-url = [% handle_service_url %]
-default-shock-server = [% shock_url %]
-# the commit below is the latest on the p3_cli branch
-source-commit-hash = 76ec1dedf5c3ede31ea1435864c02eedaacd5f1c
-