diff --git a/display_applications/biom/biom_simple.xml b/lib/galaxy/datatypes/display_applications/configs/biom/biom_simple.xml
similarity index 100%
rename from display_applications/biom/biom_simple.xml
rename to lib/galaxy/datatypes/display_applications/configs/biom/biom_simple.xml
diff --git a/display_applications/ensembl/ensembl_bam.xml b/lib/galaxy/datatypes/display_applications/configs/ensembl/ensembl_bam.xml
similarity index 100%
rename from display_applications/ensembl/ensembl_bam.xml
rename to lib/galaxy/datatypes/display_applications/configs/ensembl/ensembl_bam.xml
diff --git a/display_applications/ensembl/ensembl_gff.xml b/lib/galaxy/datatypes/display_applications/configs/ensembl/ensembl_gff.xml
similarity index 100%
rename from display_applications/ensembl/ensembl_gff.xml
rename to lib/galaxy/datatypes/display_applications/configs/ensembl/ensembl_gff.xml
diff --git a/display_applications/ensembl/ensembl_interval_as_bed.xml b/lib/galaxy/datatypes/display_applications/configs/ensembl/ensembl_interval_as_bed.xml
similarity index 100%
rename from display_applications/ensembl/ensembl_interval_as_bed.xml
rename to lib/galaxy/datatypes/display_applications/configs/ensembl/ensembl_interval_as_bed.xml
diff --git a/display_applications/gbrowse/gbrowse_gff.xml b/lib/galaxy/datatypes/display_applications/configs/gbrowse/gbrowse_gff.xml
similarity index 100%
rename from display_applications/gbrowse/gbrowse_gff.xml
rename to lib/galaxy/datatypes/display_applications/configs/gbrowse/gbrowse_gff.xml
diff --git a/display_applications/gbrowse/gbrowse_interval_as_bed.xml b/lib/galaxy/datatypes/display_applications/configs/gbrowse/gbrowse_interval_as_bed.xml
similarity index 100%
rename from display_applications/gbrowse/gbrowse_interval_as_bed.xml
rename to lib/galaxy/datatypes/display_applications/configs/gbrowse/gbrowse_interval_as_bed.xml
diff --git a/display_applications/gbrowse/gbrowse_wig.xml b/lib/galaxy/datatypes/display_applications/configs/gbrowse/gbrowse_wig.xml
similarity index 100%
rename from display_applications/gbrowse/gbrowse_wig.xml
rename to lib/galaxy/datatypes/display_applications/configs/gbrowse/gbrowse_wig.xml
diff --git a/display_applications/igb/bam.xml b/lib/galaxy/datatypes/display_applications/configs/igb/bam.xml
similarity index 100%
rename from display_applications/igb/bam.xml
rename to lib/galaxy/datatypes/display_applications/configs/igb/bam.xml
diff --git a/display_applications/igb/bb.xml b/lib/galaxy/datatypes/display_applications/configs/igb/bb.xml
similarity index 100%
rename from display_applications/igb/bb.xml
rename to lib/galaxy/datatypes/display_applications/configs/igb/bb.xml
diff --git a/display_applications/igb/bed.xml b/lib/galaxy/datatypes/display_applications/configs/igb/bed.xml
similarity index 100%
rename from display_applications/igb/bed.xml
rename to lib/galaxy/datatypes/display_applications/configs/igb/bed.xml
diff --git a/display_applications/igb/bedgraph.xml b/lib/galaxy/datatypes/display_applications/configs/igb/bedgraph.xml
similarity index 100%
rename from display_applications/igb/bedgraph.xml
rename to lib/galaxy/datatypes/display_applications/configs/igb/bedgraph.xml
diff --git a/display_applications/igb/bigwig.xml b/lib/galaxy/datatypes/display_applications/configs/igb/bigwig.xml
similarity index 100%
rename from display_applications/igb/bigwig.xml
rename to lib/galaxy/datatypes/display_applications/configs/igb/bigwig.xml
diff --git a/display_applications/igb/gtf.xml b/lib/galaxy/datatypes/display_applications/configs/igb/gtf.xml
similarity index 100%
rename from display_applications/igb/gtf.xml
rename to lib/galaxy/datatypes/display_applications/configs/igb/gtf.xml
diff --git a/display_applications/igb/wig.xml b/lib/galaxy/datatypes/display_applications/configs/igb/wig.xml
similarity index 100%
rename from display_applications/igb/wig.xml
rename to lib/galaxy/datatypes/display_applications/configs/igb/wig.xml
diff --git a/display_applications/igv/bam.xml b/lib/galaxy/datatypes/display_applications/configs/igv/bam.xml
similarity index 100%
rename from display_applications/igv/bam.xml
rename to lib/galaxy/datatypes/display_applications/configs/igv/bam.xml
diff --git a/display_applications/igv/gff.xml b/lib/galaxy/datatypes/display_applications/configs/igv/gff.xml
similarity index 100%
rename from display_applications/igv/gff.xml
rename to lib/galaxy/datatypes/display_applications/configs/igv/gff.xml
diff --git a/display_applications/igv/interval_as_bed.xml b/lib/galaxy/datatypes/display_applications/configs/igv/interval_as_bed.xml
similarity index 100%
rename from display_applications/igv/interval_as_bed.xml
rename to lib/galaxy/datatypes/display_applications/configs/igv/interval_as_bed.xml
diff --git a/display_applications/igv/vcf.xml b/lib/galaxy/datatypes/display_applications/configs/igv/vcf.xml
similarity index 100%
rename from display_applications/igv/vcf.xml
rename to lib/galaxy/datatypes/display_applications/configs/igv/vcf.xml
diff --git a/display_applications/iobio/bam.xml b/lib/galaxy/datatypes/display_applications/configs/iobio/bam.xml
similarity index 100%
rename from display_applications/iobio/bam.xml
rename to lib/galaxy/datatypes/display_applications/configs/iobio/bam.xml
diff --git a/display_applications/iobio/vcf.xml b/lib/galaxy/datatypes/display_applications/configs/iobio/vcf.xml
similarity index 100%
rename from display_applications/iobio/vcf.xml
rename to lib/galaxy/datatypes/display_applications/configs/iobio/vcf.xml
diff --git a/display_applications/rviewer/bed.xml b/lib/galaxy/datatypes/display_applications/configs/rviewer/bed.xml
similarity index 100%
rename from display_applications/rviewer/bed.xml
rename to lib/galaxy/datatypes/display_applications/configs/rviewer/bed.xml
diff --git a/display_applications/rviewer/vcf.xml b/lib/galaxy/datatypes/display_applications/configs/rviewer/vcf.xml
similarity index 100%
rename from display_applications/rviewer/vcf.xml
rename to lib/galaxy/datatypes/display_applications/configs/rviewer/vcf.xml
diff --git a/display_applications/ucsc/bam.xml b/lib/galaxy/datatypes/display_applications/configs/ucsc/bam.xml
similarity index 100%
rename from display_applications/ucsc/bam.xml
rename to lib/galaxy/datatypes/display_applications/configs/ucsc/bam.xml
diff --git a/display_applications/ucsc/bigbed.xml b/lib/galaxy/datatypes/display_applications/configs/ucsc/bigbed.xml
similarity index 100%
rename from display_applications/ucsc/bigbed.xml
rename to lib/galaxy/datatypes/display_applications/configs/ucsc/bigbed.xml
diff --git a/display_applications/ucsc/bigwig.xml b/lib/galaxy/datatypes/display_applications/configs/ucsc/bigwig.xml
similarity index 100%
rename from display_applications/ucsc/bigwig.xml
rename to lib/galaxy/datatypes/display_applications/configs/ucsc/bigwig.xml
diff --git a/display_applications/ucsc/interval_as_bed.xml b/lib/galaxy/datatypes/display_applications/configs/ucsc/interval_as_bed.xml
similarity index 100%
rename from display_applications/ucsc/interval_as_bed.xml
rename to lib/galaxy/datatypes/display_applications/configs/ucsc/interval_as_bed.xml
diff --git a/display_applications/ucsc/maf_customtrack.xml b/lib/galaxy/datatypes/display_applications/configs/ucsc/maf_customtrack.xml
similarity index 100%
rename from display_applications/ucsc/maf_customtrack.xml
rename to lib/galaxy/datatypes/display_applications/configs/ucsc/maf_customtrack.xml
diff --git a/display_applications/ucsc/vcf.xml b/lib/galaxy/datatypes/display_applications/configs/ucsc/vcf.xml
similarity index 100%
rename from display_applications/ucsc/vcf.xml
rename to lib/galaxy/datatypes/display_applications/configs/ucsc/vcf.xml
diff --git a/tools/data_source/access_libraries.xml b/lib/galaxy/tools/bundled/data_source/access_libraries.xml
similarity index 100%
rename from tools/data_source/access_libraries.xml
rename to lib/galaxy/tools/bundled/data_source/access_libraries.xml
diff --git a/tools/data_source/bed_convert.xml b/lib/galaxy/tools/bundled/data_source/bed_convert.xml
similarity index 100%
rename from tools/data_source/bed_convert.xml
rename to lib/galaxy/tools/bundled/data_source/bed_convert.xml
diff --git a/tools/data_source/biomart.xml b/lib/galaxy/tools/bundled/data_source/biomart.xml
similarity index 100%
rename from tools/data_source/biomart.xml
rename to lib/galaxy/tools/bundled/data_source/biomart.xml
diff --git a/tools/data_source/biomart_test.xml b/lib/galaxy/tools/bundled/data_source/biomart_test.xml
similarity index 100%
rename from tools/data_source/biomart_test.xml
rename to lib/galaxy/tools/bundled/data_source/biomart_test.xml
diff --git a/tools/data_source/cbi_rice_mart.xml b/lib/galaxy/tools/bundled/data_source/cbi_rice_mart.xml
similarity index 100%
rename from tools/data_source/cbi_rice_mart.xml
rename to lib/galaxy/tools/bundled/data_source/cbi_rice_mart.xml
diff --git a/tools/data_source/data_source.py b/lib/galaxy/tools/bundled/data_source/data_source.py
similarity index 100%
rename from tools/data_source/data_source.py
rename to lib/galaxy/tools/bundled/data_source/data_source.py
diff --git a/tools/data_source/ebi_sra.xml b/lib/galaxy/tools/bundled/data_source/ebi_sra.xml
similarity index 100%
rename from tools/data_source/ebi_sra.xml
rename to lib/galaxy/tools/bundled/data_source/ebi_sra.xml
diff --git a/tools/data_source/eupathdb.xml b/lib/galaxy/tools/bundled/data_source/eupathdb.xml
similarity index 100%
rename from tools/data_source/eupathdb.xml
rename to lib/galaxy/tools/bundled/data_source/eupathdb.xml
diff --git a/tools/data_source/fetch.py b/lib/galaxy/tools/bundled/data_source/fetch.py
similarity index 100%
rename from tools/data_source/fetch.py
rename to lib/galaxy/tools/bundled/data_source/fetch.py
diff --git a/tools/data_source/fly_modencode.xml b/lib/galaxy/tools/bundled/data_source/fly_modencode.xml
similarity index 100%
rename from tools/data_source/fly_modencode.xml
rename to lib/galaxy/tools/bundled/data_source/fly_modencode.xml
diff --git a/tools/data_source/flymine.xml b/lib/galaxy/tools/bundled/data_source/flymine.xml
similarity index 100%
rename from tools/data_source/flymine.xml
rename to lib/galaxy/tools/bundled/data_source/flymine.xml
diff --git a/tools/data_source/flymine_test.xml b/lib/galaxy/tools/bundled/data_source/flymine_test.xml
similarity index 100%
rename from tools/data_source/flymine_test.xml
rename to lib/galaxy/tools/bundled/data_source/flymine_test.xml
diff --git a/tools/data_source/genbank.py b/lib/galaxy/tools/bundled/data_source/genbank.py
similarity index 100%
rename from tools/data_source/genbank.py
rename to lib/galaxy/tools/bundled/data_source/genbank.py
diff --git a/tools/data_source/genbank.xml b/lib/galaxy/tools/bundled/data_source/genbank.xml
similarity index 100%
rename from tools/data_source/genbank.xml
rename to lib/galaxy/tools/bundled/data_source/genbank.xml
diff --git a/tools/data_source/gramene_mart.xml b/lib/galaxy/tools/bundled/data_source/gramene_mart.xml
similarity index 100%
rename from tools/data_source/gramene_mart.xml
rename to lib/galaxy/tools/bundled/data_source/gramene_mart.xml
diff --git a/tools/data_source/hapmapmart.xml b/lib/galaxy/tools/bundled/data_source/hapmapmart.xml
similarity index 100%
rename from tools/data_source/hapmapmart.xml
rename to lib/galaxy/tools/bundled/data_source/hapmapmart.xml
diff --git a/tools/data_source/hbvar.xml b/lib/galaxy/tools/bundled/data_source/hbvar.xml
similarity index 100%
rename from tools/data_source/hbvar.xml
rename to lib/galaxy/tools/bundled/data_source/hbvar.xml
diff --git a/tools/data_source/hbvar_filter.py b/lib/galaxy/tools/bundled/data_source/hbvar_filter.py
similarity index 100%
rename from tools/data_source/hbvar_filter.py
rename to lib/galaxy/tools/bundled/data_source/hbvar_filter.py
diff --git a/tools/data_source/import.py b/lib/galaxy/tools/bundled/data_source/import.py
similarity index 100%
rename from tools/data_source/import.py
rename to lib/galaxy/tools/bundled/data_source/import.py
diff --git a/tools/data_source/import.xml b/lib/galaxy/tools/bundled/data_source/import.xml
similarity index 100%
rename from tools/data_source/import.xml
rename to lib/galaxy/tools/bundled/data_source/import.xml
diff --git a/tools/data_source/metabolicmine.xml b/lib/galaxy/tools/bundled/data_source/metabolicmine.xml
similarity index 100%
rename from tools/data_source/metabolicmine.xml
rename to lib/galaxy/tools/bundled/data_source/metabolicmine.xml
diff --git a/tools/data_source/microbial_import.py b/lib/galaxy/tools/bundled/data_source/microbial_import.py
similarity index 100%
rename from tools/data_source/microbial_import.py
rename to lib/galaxy/tools/bundled/data_source/microbial_import.py
diff --git a/tools/data_source/microbial_import.xml b/lib/galaxy/tools/bundled/data_source/microbial_import.xml
similarity index 100%
rename from tools/data_source/microbial_import.xml
rename to lib/galaxy/tools/bundled/data_source/microbial_import.xml
diff --git a/tools/data_source/microbial_import_code.py b/lib/galaxy/tools/bundled/data_source/microbial_import_code.py
similarity index 100%
rename from tools/data_source/microbial_import_code.py
rename to lib/galaxy/tools/bundled/data_source/microbial_import_code.py
diff --git a/tools/data_source/modmine.xml b/lib/galaxy/tools/bundled/data_source/modmine.xml
similarity index 100%
rename from tools/data_source/modmine.xml
rename to lib/galaxy/tools/bundled/data_source/modmine.xml
diff --git a/tools/data_source/mousemine.xml b/lib/galaxy/tools/bundled/data_source/mousemine.xml
similarity index 100%
rename from tools/data_source/mousemine.xml
rename to lib/galaxy/tools/bundled/data_source/mousemine.xml
diff --git a/tools/data_source/ratmine.xml b/lib/galaxy/tools/bundled/data_source/ratmine.xml
similarity index 100%
rename from tools/data_source/ratmine.xml
rename to lib/galaxy/tools/bundled/data_source/ratmine.xml
diff --git a/tools/data_source/ucsc_tablebrowser.xml b/lib/galaxy/tools/bundled/data_source/ucsc_tablebrowser.xml
similarity index 100%
rename from tools/data_source/ucsc_tablebrowser.xml
rename to lib/galaxy/tools/bundled/data_source/ucsc_tablebrowser.xml
diff --git a/tools/data_source/ucsc_tablebrowser_archaea.xml b/lib/galaxy/tools/bundled/data_source/ucsc_tablebrowser_archaea.xml
similarity index 100%
rename from tools/data_source/ucsc_tablebrowser_archaea.xml
rename to lib/galaxy/tools/bundled/data_source/ucsc_tablebrowser_archaea.xml
diff --git a/tools/data_source/ucsc_tablebrowser_test.xml b/lib/galaxy/tools/bundled/data_source/ucsc_tablebrowser_test.xml
similarity index 100%
rename from tools/data_source/ucsc_tablebrowser_test.xml
rename to lib/galaxy/tools/bundled/data_source/ucsc_tablebrowser_test.xml
diff --git a/tools/data_source/upload.py b/lib/galaxy/tools/bundled/data_source/upload.py
similarity index 100%
rename from tools/data_source/upload.py
rename to lib/galaxy/tools/bundled/data_source/upload.py
diff --git a/tools/data_source/upload.xml b/lib/galaxy/tools/bundled/data_source/upload.xml
similarity index 100%
rename from tools/data_source/upload.xml
rename to lib/galaxy/tools/bundled/data_source/upload.xml
diff --git a/tools/data_source/worm_modencode.xml b/lib/galaxy/tools/bundled/data_source/worm_modencode.xml
similarity index 100%
rename from tools/data_source/worm_modencode.xml
rename to lib/galaxy/tools/bundled/data_source/worm_modencode.xml
diff --git a/tools/data_source/wormbase.xml b/lib/galaxy/tools/bundled/data_source/wormbase.xml
similarity index 100%
rename from tools/data_source/wormbase.xml
rename to lib/galaxy/tools/bundled/data_source/wormbase.xml
diff --git a/tools/data_source/wormbase_test.xml b/lib/galaxy/tools/bundled/data_source/wormbase_test.xml
similarity index 100%
rename from tools/data_source/wormbase_test.xml
rename to lib/galaxy/tools/bundled/data_source/wormbase_test.xml
diff --git a/tools/data_source/yeastmine.xml b/lib/galaxy/tools/bundled/data_source/yeastmine.xml
similarity index 100%
rename from tools/data_source/yeastmine.xml
rename to lib/galaxy/tools/bundled/data_source/yeastmine.xml
diff --git a/tools/data_source/zebrafishmine.xml b/lib/galaxy/tools/bundled/data_source/zebrafishmine.xml
similarity index 100%
rename from tools/data_source/zebrafishmine.xml
rename to lib/galaxy/tools/bundled/data_source/zebrafishmine.xml
diff --git a/tools/evolution/add_scores.py b/lib/galaxy/tools/bundled/evolution/add_scores.py
similarity index 100%
rename from tools/evolution/add_scores.py
rename to lib/galaxy/tools/bundled/evolution/add_scores.py
diff --git a/tools/evolution/add_scores.xml b/lib/galaxy/tools/bundled/evolution/add_scores.xml
similarity index 100%
rename from tools/evolution/add_scores.xml
rename to lib/galaxy/tools/bundled/evolution/add_scores.xml
diff --git a/tools/evolution/codingSnps.pl b/lib/galaxy/tools/bundled/evolution/codingSnps.pl
similarity index 100%
rename from tools/evolution/codingSnps.pl
rename to lib/galaxy/tools/bundled/evolution/codingSnps.pl
diff --git a/tools/evolution/codingSnps.xml b/lib/galaxy/tools/bundled/evolution/codingSnps.xml
similarity index 100%
rename from tools/evolution/codingSnps.xml
rename to lib/galaxy/tools/bundled/evolution/codingSnps.xml
diff --git a/tools/evolution/codingSnps_filter.py b/lib/galaxy/tools/bundled/evolution/codingSnps_filter.py
similarity index 100%
rename from tools/evolution/codingSnps_filter.py
rename to lib/galaxy/tools/bundled/evolution/codingSnps_filter.py
diff --git a/tools/extract/extract_genomic_dna.py b/lib/galaxy/tools/bundled/extract/extract_genomic_dna.py
similarity index 100%
rename from tools/extract/extract_genomic_dna.py
rename to lib/galaxy/tools/bundled/extract/extract_genomic_dna.py
diff --git a/tools/extract/extract_genomic_dna.xml b/lib/galaxy/tools/bundled/extract/extract_genomic_dna.xml
similarity index 100%
rename from tools/extract/extract_genomic_dna.xml
rename to lib/galaxy/tools/bundled/extract/extract_genomic_dna.xml
diff --git a/tools/extract/liftOver_wrapper.py b/lib/galaxy/tools/bundled/extract/liftOver_wrapper.py
similarity index 100%
rename from tools/extract/liftOver_wrapper.py
rename to lib/galaxy/tools/bundled/extract/liftOver_wrapper.py
diff --git a/tools/extract/liftOver_wrapper.xml b/lib/galaxy/tools/bundled/extract/liftOver_wrapper.xml
similarity index 100%
rename from tools/extract/liftOver_wrapper.xml
rename to lib/galaxy/tools/bundled/extract/liftOver_wrapper.xml
diff --git a/tools/filters/CreateInterval.pl b/lib/galaxy/tools/bundled/filters/CreateInterval.pl
similarity index 100%
rename from tools/filters/CreateInterval.pl
rename to lib/galaxy/tools/bundled/filters/CreateInterval.pl
diff --git a/tools/filters/CreateInterval.xml b/lib/galaxy/tools/bundled/filters/CreateInterval.xml
similarity index 100%
rename from tools/filters/CreateInterval.xml
rename to lib/galaxy/tools/bundled/filters/CreateInterval.xml
diff --git a/tools/filters/axt_to_concat_fasta.py b/lib/galaxy/tools/bundled/filters/axt_to_concat_fasta.py
similarity index 100%
rename from tools/filters/axt_to_concat_fasta.py
rename to lib/galaxy/tools/bundled/filters/axt_to_concat_fasta.py
diff --git a/tools/filters/axt_to_concat_fasta.xml b/lib/galaxy/tools/bundled/filters/axt_to_concat_fasta.xml
similarity index 100%
rename from tools/filters/axt_to_concat_fasta.xml
rename to lib/galaxy/tools/bundled/filters/axt_to_concat_fasta.xml
diff --git a/tools/filters/axt_to_fasta.py b/lib/galaxy/tools/bundled/filters/axt_to_fasta.py
similarity index 100%
rename from tools/filters/axt_to_fasta.py
rename to lib/galaxy/tools/bundled/filters/axt_to_fasta.py
diff --git a/tools/filters/axt_to_fasta.xml b/lib/galaxy/tools/bundled/filters/axt_to_fasta.xml
similarity index 100%
rename from tools/filters/axt_to_fasta.xml
rename to lib/galaxy/tools/bundled/filters/axt_to_fasta.xml
diff --git a/tools/filters/axt_to_lav.py b/lib/galaxy/tools/bundled/filters/axt_to_lav.py
similarity index 100%
rename from tools/filters/axt_to_lav.py
rename to lib/galaxy/tools/bundled/filters/axt_to_lav.py
diff --git a/tools/filters/axt_to_lav.xml b/lib/galaxy/tools/bundled/filters/axt_to_lav.xml
similarity index 100%
rename from tools/filters/axt_to_lav.xml
rename to lib/galaxy/tools/bundled/filters/axt_to_lav.xml
diff --git a/tools/filters/axt_to_lav_code.py b/lib/galaxy/tools/bundled/filters/axt_to_lav_code.py
similarity index 100%
rename from tools/filters/axt_to_lav_code.py
rename to lib/galaxy/tools/bundled/filters/axt_to_lav_code.py
diff --git a/tools/filters/bed2gff.xml b/lib/galaxy/tools/bundled/filters/bed2gff.xml
similarity index 100%
rename from tools/filters/bed2gff.xml
rename to lib/galaxy/tools/bundled/filters/bed2gff.xml
diff --git a/tools/filters/bed_to_bigbed.xml b/lib/galaxy/tools/bundled/filters/bed_to_bigbed.xml
similarity index 100%
rename from tools/filters/bed_to_bigbed.xml
rename to lib/galaxy/tools/bundled/filters/bed_to_bigbed.xml
diff --git a/tools/filters/bed_to_gff_converter.py b/lib/galaxy/tools/bundled/filters/bed_to_gff_converter.py
similarity index 100%
rename from tools/filters/bed_to_gff_converter.py
rename to lib/galaxy/tools/bundled/filters/bed_to_gff_converter.py
diff --git a/tools/filters/catWrapper.py b/lib/galaxy/tools/bundled/filters/catWrapper.py
similarity index 100%
rename from tools/filters/catWrapper.py
rename to lib/galaxy/tools/bundled/filters/catWrapper.py
diff --git a/tools/filters/catWrapper.xml b/lib/galaxy/tools/bundled/filters/catWrapper.xml
similarity index 100%
rename from tools/filters/catWrapper.xml
rename to lib/galaxy/tools/bundled/filters/catWrapper.xml
diff --git a/tools/filters/changeCase.pl b/lib/galaxy/tools/bundled/filters/changeCase.pl
similarity index 100%
rename from tools/filters/changeCase.pl
rename to lib/galaxy/tools/bundled/filters/changeCase.pl
diff --git a/tools/filters/changeCase.xml b/lib/galaxy/tools/bundled/filters/changeCase.xml
similarity index 100%
rename from tools/filters/changeCase.xml
rename to lib/galaxy/tools/bundled/filters/changeCase.xml
diff --git a/tools/filters/commWrapper.pl b/lib/galaxy/tools/bundled/filters/commWrapper.pl
similarity index 100%
rename from tools/filters/commWrapper.pl
rename to lib/galaxy/tools/bundled/filters/commWrapper.pl
diff --git a/tools/filters/commWrapper.xml b/lib/galaxy/tools/bundled/filters/commWrapper.xml
similarity index 100%
rename from tools/filters/commWrapper.xml
rename to lib/galaxy/tools/bundled/filters/commWrapper.xml
diff --git a/tools/filters/compare.xml b/lib/galaxy/tools/bundled/filters/compare.xml
similarity index 100%
rename from tools/filters/compare.xml
rename to lib/galaxy/tools/bundled/filters/compare.xml
diff --git a/tools/filters/condense_characters.pl b/lib/galaxy/tools/bundled/filters/condense_characters.pl
similarity index 100%
rename from tools/filters/condense_characters.pl
rename to lib/galaxy/tools/bundled/filters/condense_characters.pl
diff --git a/tools/filters/condense_characters.xml b/lib/galaxy/tools/bundled/filters/condense_characters.xml
similarity index 100%
rename from tools/filters/condense_characters.xml
rename to lib/galaxy/tools/bundled/filters/condense_characters.xml
diff --git a/tools/filters/convert_characters.pl b/lib/galaxy/tools/bundled/filters/convert_characters.pl
similarity index 100%
rename from tools/filters/convert_characters.pl
rename to lib/galaxy/tools/bundled/filters/convert_characters.pl
diff --git a/tools/filters/convert_characters.py b/lib/galaxy/tools/bundled/filters/convert_characters.py
similarity index 100%
rename from tools/filters/convert_characters.py
rename to lib/galaxy/tools/bundled/filters/convert_characters.py
diff --git a/tools/filters/convert_characters.xml b/lib/galaxy/tools/bundled/filters/convert_characters.xml
similarity index 100%
rename from tools/filters/convert_characters.xml
rename to lib/galaxy/tools/bundled/filters/convert_characters.xml
diff --git a/tools/filters/cutWrapper.pl b/lib/galaxy/tools/bundled/filters/cutWrapper.pl
similarity index 100%
rename from tools/filters/cutWrapper.pl
rename to lib/galaxy/tools/bundled/filters/cutWrapper.pl
diff --git a/tools/filters/cutWrapper.xml b/lib/galaxy/tools/bundled/filters/cutWrapper.xml
similarity index 100%
rename from tools/filters/cutWrapper.xml
rename to lib/galaxy/tools/bundled/filters/cutWrapper.xml
diff --git a/tools/filters/fileGrep.xml b/lib/galaxy/tools/bundled/filters/fileGrep.xml
similarity index 100%
rename from tools/filters/fileGrep.xml
rename to lib/galaxy/tools/bundled/filters/fileGrep.xml
diff --git a/tools/filters/fixedValueColumn.pl b/lib/galaxy/tools/bundled/filters/fixedValueColumn.pl
similarity index 100%
rename from tools/filters/fixedValueColumn.pl
rename to lib/galaxy/tools/bundled/filters/fixedValueColumn.pl
diff --git a/tools/filters/fixedValueColumn.xml b/lib/galaxy/tools/bundled/filters/fixedValueColumn.xml
similarity index 100%
rename from tools/filters/fixedValueColumn.xml
rename to lib/galaxy/tools/bundled/filters/fixedValueColumn.xml
diff --git a/tools/filters/gff/extract_GFF_Features.py b/lib/galaxy/tools/bundled/filters/gff/extract_GFF_Features.py
similarity index 100%
rename from tools/filters/gff/extract_GFF_Features.py
rename to lib/galaxy/tools/bundled/filters/gff/extract_GFF_Features.py
diff --git a/tools/filters/gff/extract_GFF_Features.xml b/lib/galaxy/tools/bundled/filters/gff/extract_GFF_Features.xml
similarity index 100%
rename from tools/filters/gff/extract_GFF_Features.xml
rename to lib/galaxy/tools/bundled/filters/gff/extract_GFF_Features.xml
diff --git a/tools/filters/gff/gff_filter_by_attribute.py b/lib/galaxy/tools/bundled/filters/gff/gff_filter_by_attribute.py
similarity index 100%
rename from tools/filters/gff/gff_filter_by_attribute.py
rename to lib/galaxy/tools/bundled/filters/gff/gff_filter_by_attribute.py
diff --git a/tools/filters/gff/gff_filter_by_attribute.xml b/lib/galaxy/tools/bundled/filters/gff/gff_filter_by_attribute.xml
similarity index 100%
rename from tools/filters/gff/gff_filter_by_attribute.xml
rename to lib/galaxy/tools/bundled/filters/gff/gff_filter_by_attribute.xml
diff --git a/tools/filters/gff/gff_filter_by_feature_count.py b/lib/galaxy/tools/bundled/filters/gff/gff_filter_by_feature_count.py
similarity index 100%
rename from tools/filters/gff/gff_filter_by_feature_count.py
rename to lib/galaxy/tools/bundled/filters/gff/gff_filter_by_feature_count.py
diff --git a/tools/filters/gff/gff_filter_by_feature_count.xml b/lib/galaxy/tools/bundled/filters/gff/gff_filter_by_feature_count.xml
similarity index 100%
rename from tools/filters/gff/gff_filter_by_feature_count.xml
rename to lib/galaxy/tools/bundled/filters/gff/gff_filter_by_feature_count.xml
diff --git a/tools/filters/gff/gtf_filter_by_attribute_values_list.py b/lib/galaxy/tools/bundled/filters/gff/gtf_filter_by_attribute_values_list.py
similarity index 100%
rename from tools/filters/gff/gtf_filter_by_attribute_values_list.py
rename to lib/galaxy/tools/bundled/filters/gff/gtf_filter_by_attribute_values_list.py
diff --git a/tools/filters/gff/gtf_filter_by_attribute_values_list.xml b/lib/galaxy/tools/bundled/filters/gff/gtf_filter_by_attribute_values_list.xml
similarity index 100%
rename from tools/filters/gff/gtf_filter_by_attribute_values_list.xml
rename to lib/galaxy/tools/bundled/filters/gff/gtf_filter_by_attribute_values_list.xml
diff --git a/tools/filters/gff/sort_gtf.py b/lib/galaxy/tools/bundled/filters/gff/sort_gtf.py
similarity index 100%
rename from tools/filters/gff/sort_gtf.py
rename to lib/galaxy/tools/bundled/filters/gff/sort_gtf.py
diff --git a/tools/filters/gff2bed.xml b/lib/galaxy/tools/bundled/filters/gff2bed.xml
similarity index 100%
rename from tools/filters/gff2bed.xml
rename to lib/galaxy/tools/bundled/filters/gff2bed.xml
diff --git a/tools/filters/gff_to_bed_converter.py b/lib/galaxy/tools/bundled/filters/gff_to_bed_converter.py
similarity index 100%
rename from tools/filters/gff_to_bed_converter.py
rename to lib/galaxy/tools/bundled/filters/gff_to_bed_converter.py
diff --git a/tools/filters/grep.py b/lib/galaxy/tools/bundled/filters/grep.py
similarity index 100%
rename from tools/filters/grep.py
rename to lib/galaxy/tools/bundled/filters/grep.py
diff --git a/tools/filters/grep.xml b/lib/galaxy/tools/bundled/filters/grep.xml
similarity index 100%
rename from tools/filters/grep.xml
rename to lib/galaxy/tools/bundled/filters/grep.xml
diff --git a/tools/filters/gtf2bedgraph.xml b/lib/galaxy/tools/bundled/filters/gtf2bedgraph.xml
similarity index 100%
rename from tools/filters/gtf2bedgraph.xml
rename to lib/galaxy/tools/bundled/filters/gtf2bedgraph.xml
diff --git a/tools/filters/gtf_to_bedgraph_converter.py b/lib/galaxy/tools/bundled/filters/gtf_to_bedgraph_converter.py
similarity index 100%
rename from tools/filters/gtf_to_bedgraph_converter.py
rename to lib/galaxy/tools/bundled/filters/gtf_to_bedgraph_converter.py
diff --git a/tools/filters/headWrapper.pl b/lib/galaxy/tools/bundled/filters/headWrapper.pl
similarity index 100%
rename from tools/filters/headWrapper.pl
rename to lib/galaxy/tools/bundled/filters/headWrapper.pl
diff --git a/tools/filters/headWrapper.xml b/lib/galaxy/tools/bundled/filters/headWrapper.xml
similarity index 100%
rename from tools/filters/headWrapper.xml
rename to lib/galaxy/tools/bundled/filters/headWrapper.xml
diff --git a/tools/filters/join.py b/lib/galaxy/tools/bundled/filters/join.py
similarity index 100%
rename from tools/filters/join.py
rename to lib/galaxy/tools/bundled/filters/join.py
diff --git a/tools/filters/joinWrapper.pl b/lib/galaxy/tools/bundled/filters/joinWrapper.pl
similarity index 100%
rename from tools/filters/joinWrapper.pl
rename to lib/galaxy/tools/bundled/filters/joinWrapper.pl
diff --git a/tools/filters/joinWrapper.py b/lib/galaxy/tools/bundled/filters/joinWrapper.py
similarity index 100%
rename from tools/filters/joinWrapper.py
rename to lib/galaxy/tools/bundled/filters/joinWrapper.py
diff --git a/tools/filters/joiner.xml b/lib/galaxy/tools/bundled/filters/joiner.xml
similarity index 100%
rename from tools/filters/joiner.xml
rename to lib/galaxy/tools/bundled/filters/joiner.xml
diff --git a/tools/filters/joiner2.xml b/lib/galaxy/tools/bundled/filters/joiner2.xml
similarity index 100%
rename from tools/filters/joiner2.xml
rename to lib/galaxy/tools/bundled/filters/joiner2.xml
diff --git a/tools/filters/lav_to_bed.py b/lib/galaxy/tools/bundled/filters/lav_to_bed.py
similarity index 100%
rename from tools/filters/lav_to_bed.py
rename to lib/galaxy/tools/bundled/filters/lav_to_bed.py
diff --git a/tools/filters/lav_to_bed.xml b/lib/galaxy/tools/bundled/filters/lav_to_bed.xml
similarity index 100%
rename from tools/filters/lav_to_bed.xml
rename to lib/galaxy/tools/bundled/filters/lav_to_bed.xml
diff --git a/tools/filters/lav_to_bed_code.py b/lib/galaxy/tools/bundled/filters/lav_to_bed_code.py
similarity index 100%
rename from tools/filters/lav_to_bed_code.py
rename to lib/galaxy/tools/bundled/filters/lav_to_bed_code.py
diff --git a/tools/filters/mergeCols.py b/lib/galaxy/tools/bundled/filters/mergeCols.py
similarity index 100%
rename from tools/filters/mergeCols.py
rename to lib/galaxy/tools/bundled/filters/mergeCols.py
diff --git a/tools/filters/mergeCols.xml b/lib/galaxy/tools/bundled/filters/mergeCols.xml
similarity index 100%
rename from tools/filters/mergeCols.xml
rename to lib/galaxy/tools/bundled/filters/mergeCols.xml
diff --git a/tools/filters/pasteWrapper.pl b/lib/galaxy/tools/bundled/filters/pasteWrapper.pl
similarity index 100%
rename from tools/filters/pasteWrapper.pl
rename to lib/galaxy/tools/bundled/filters/pasteWrapper.pl
diff --git a/tools/filters/pasteWrapper.xml b/lib/galaxy/tools/bundled/filters/pasteWrapper.xml
similarity index 100%
rename from tools/filters/pasteWrapper.xml
rename to lib/galaxy/tools/bundled/filters/pasteWrapper.xml
diff --git a/tools/filters/random_lines_two_pass.py b/lib/galaxy/tools/bundled/filters/random_lines_two_pass.py
similarity index 100%
rename from tools/filters/random_lines_two_pass.py
rename to lib/galaxy/tools/bundled/filters/random_lines_two_pass.py
diff --git a/tools/filters/randomlines.py b/lib/galaxy/tools/bundled/filters/randomlines.py
similarity index 100%
rename from tools/filters/randomlines.py
rename to lib/galaxy/tools/bundled/filters/randomlines.py
diff --git a/tools/filters/randomlines.xml b/lib/galaxy/tools/bundled/filters/randomlines.xml
similarity index 100%
rename from tools/filters/randomlines.xml
rename to lib/galaxy/tools/bundled/filters/randomlines.xml
diff --git a/tools/filters/remove_beginning.pl b/lib/galaxy/tools/bundled/filters/remove_beginning.pl
similarity index 100%
rename from tools/filters/remove_beginning.pl
rename to lib/galaxy/tools/bundled/filters/remove_beginning.pl
diff --git a/tools/filters/remove_beginning.xml b/lib/galaxy/tools/bundled/filters/remove_beginning.xml
similarity index 100%
rename from tools/filters/remove_beginning.xml
rename to lib/galaxy/tools/bundled/filters/remove_beginning.xml
diff --git a/tools/filters/secure_hash_message_digest.py b/lib/galaxy/tools/bundled/filters/secure_hash_message_digest.py
similarity index 100%
rename from tools/filters/secure_hash_message_digest.py
rename to lib/galaxy/tools/bundled/filters/secure_hash_message_digest.py
diff --git a/tools/filters/secure_hash_message_digest.xml b/lib/galaxy/tools/bundled/filters/secure_hash_message_digest.xml
similarity index 100%
rename from tools/filters/secure_hash_message_digest.xml
rename to lib/galaxy/tools/bundled/filters/secure_hash_message_digest.xml
diff --git a/tools/filters/sff_extract.py b/lib/galaxy/tools/bundled/filters/sff_extract.py
similarity index 100%
rename from tools/filters/sff_extract.py
rename to lib/galaxy/tools/bundled/filters/sff_extract.py
diff --git a/tools/filters/sff_extractor.xml b/lib/galaxy/tools/bundled/filters/sff_extractor.xml
similarity index 100%
rename from tools/filters/sff_extractor.xml
rename to lib/galaxy/tools/bundled/filters/sff_extractor.xml
diff --git a/tools/filters/sorter.py b/lib/galaxy/tools/bundled/filters/sorter.py
similarity index 100%
rename from tools/filters/sorter.py
rename to lib/galaxy/tools/bundled/filters/sorter.py
diff --git a/tools/filters/sorter.xml b/lib/galaxy/tools/bundled/filters/sorter.xml
similarity index 100%
rename from tools/filters/sorter.xml
rename to lib/galaxy/tools/bundled/filters/sorter.xml
diff --git a/tools/filters/tailWrapper.pl b/lib/galaxy/tools/bundled/filters/tailWrapper.pl
similarity index 100%
rename from tools/filters/tailWrapper.pl
rename to lib/galaxy/tools/bundled/filters/tailWrapper.pl
diff --git a/tools/filters/tailWrapper.xml b/lib/galaxy/tools/bundled/filters/tailWrapper.xml
similarity index 100%
rename from tools/filters/tailWrapper.xml
rename to lib/galaxy/tools/bundled/filters/tailWrapper.xml
diff --git a/tools/filters/trimmer.py b/lib/galaxy/tools/bundled/filters/trimmer.py
similarity index 100%
rename from tools/filters/trimmer.py
rename to lib/galaxy/tools/bundled/filters/trimmer.py
diff --git a/tools/filters/trimmer.xml b/lib/galaxy/tools/bundled/filters/trimmer.xml
similarity index 100%
rename from tools/filters/trimmer.xml
rename to lib/galaxy/tools/bundled/filters/trimmer.xml
diff --git a/tools/filters/ucsc_gene_bed_to_exon_bed.py b/lib/galaxy/tools/bundled/filters/ucsc_gene_bed_to_exon_bed.py
similarity index 100%
rename from tools/filters/ucsc_gene_bed_to_exon_bed.py
rename to lib/galaxy/tools/bundled/filters/ucsc_gene_bed_to_exon_bed.py
diff --git a/tools/filters/ucsc_gene_bed_to_exon_bed.xml b/lib/galaxy/tools/bundled/filters/ucsc_gene_bed_to_exon_bed.xml
similarity index 100%
rename from tools/filters/ucsc_gene_bed_to_exon_bed.xml
rename to lib/galaxy/tools/bundled/filters/ucsc_gene_bed_to_exon_bed.xml
diff --git a/tools/filters/ucsc_gene_bed_to_intron_bed.py b/lib/galaxy/tools/bundled/filters/ucsc_gene_bed_to_intron_bed.py
similarity index 100%
rename from tools/filters/ucsc_gene_bed_to_intron_bed.py
rename to lib/galaxy/tools/bundled/filters/ucsc_gene_bed_to_intron_bed.py
diff --git a/tools/filters/ucsc_gene_bed_to_intron_bed.xml b/lib/galaxy/tools/bundled/filters/ucsc_gene_bed_to_intron_bed.xml
similarity index 100%
rename from tools/filters/ucsc_gene_bed_to_intron_bed.xml
rename to lib/galaxy/tools/bundled/filters/ucsc_gene_bed_to_intron_bed.xml
diff --git a/tools/filters/ucsc_gene_table_to_intervals.py b/lib/galaxy/tools/bundled/filters/ucsc_gene_table_to_intervals.py
similarity index 100%
rename from tools/filters/ucsc_gene_table_to_intervals.py
rename to lib/galaxy/tools/bundled/filters/ucsc_gene_table_to_intervals.py
diff --git a/tools/filters/ucsc_gene_table_to_intervals.xml b/lib/galaxy/tools/bundled/filters/ucsc_gene_table_to_intervals.xml
similarity index 100%
rename from tools/filters/ucsc_gene_table_to_intervals.xml
rename to lib/galaxy/tools/bundled/filters/ucsc_gene_table_to_intervals.xml
diff --git a/tools/filters/uniq.py b/lib/galaxy/tools/bundled/filters/uniq.py
similarity index 100%
rename from tools/filters/uniq.py
rename to lib/galaxy/tools/bundled/filters/uniq.py
diff --git a/tools/filters/uniq.xml b/lib/galaxy/tools/bundled/filters/uniq.xml
similarity index 100%
rename from tools/filters/uniq.xml
rename to lib/galaxy/tools/bundled/filters/uniq.xml
diff --git a/tools/filters/wc_gnu.xml b/lib/galaxy/tools/bundled/filters/wc_gnu.xml
similarity index 100%
rename from tools/filters/wc_gnu.xml
rename to lib/galaxy/tools/bundled/filters/wc_gnu.xml
diff --git a/tools/filters/wig_to_bigwig.xml b/lib/galaxy/tools/bundled/filters/wig_to_bigwig.xml
similarity index 100%
rename from tools/filters/wig_to_bigwig.xml
rename to lib/galaxy/tools/bundled/filters/wig_to_bigwig.xml
diff --git a/tools/filters/wiggle_to_simple.py b/lib/galaxy/tools/bundled/filters/wiggle_to_simple.py
similarity index 100%
rename from tools/filters/wiggle_to_simple.py
rename to lib/galaxy/tools/bundled/filters/wiggle_to_simple.py
diff --git a/tools/filters/wiggle_to_simple.xml b/lib/galaxy/tools/bundled/filters/wiggle_to_simple.xml
similarity index 100%
rename from tools/filters/wiggle_to_simple.xml
rename to lib/galaxy/tools/bundled/filters/wiggle_to_simple.xml
diff --git a/tools/genomespace/genomespace_exporter.py b/lib/galaxy/tools/bundled/genomespace/genomespace_exporter.py
similarity index 100%
rename from tools/genomespace/genomespace_exporter.py
rename to lib/galaxy/tools/bundled/genomespace/genomespace_exporter.py
diff --git a/tools/genomespace/genomespace_exporter.xml b/lib/galaxy/tools/bundled/genomespace/genomespace_exporter.xml
similarity index 100%
rename from tools/genomespace/genomespace_exporter.xml
rename to lib/galaxy/tools/bundled/genomespace/genomespace_exporter.xml
diff --git a/tools/genomespace/genomespace_file_browser.py b/lib/galaxy/tools/bundled/genomespace/genomespace_file_browser.py
similarity index 100%
rename from tools/genomespace/genomespace_file_browser.py
rename to lib/galaxy/tools/bundled/genomespace/genomespace_file_browser.py
diff --git a/tools/genomespace/genomespace_file_browser_dev.xml b/lib/galaxy/tools/bundled/genomespace/genomespace_file_browser_dev.xml
similarity index 100%
rename from tools/genomespace/genomespace_file_browser_dev.xml
rename to lib/galaxy/tools/bundled/genomespace/genomespace_file_browser_dev.xml
diff --git a/tools/genomespace/genomespace_file_browser_prod.xml b/lib/galaxy/tools/bundled/genomespace/genomespace_file_browser_prod.xml
similarity index 100%
rename from tools/genomespace/genomespace_file_browser_prod.xml
rename to lib/galaxy/tools/bundled/genomespace/genomespace_file_browser_prod.xml
diff --git a/tools/genomespace/genomespace_file_browser_test.xml b/lib/galaxy/tools/bundled/genomespace/genomespace_file_browser_test.xml
similarity index 100%
rename from tools/genomespace/genomespace_file_browser_test.xml
rename to lib/galaxy/tools/bundled/genomespace/genomespace_file_browser_test.xml
diff --git a/tools/genomespace/genomespace_importer.py b/lib/galaxy/tools/bundled/genomespace/genomespace_importer.py
similarity index 100%
rename from tools/genomespace/genomespace_importer.py
rename to lib/galaxy/tools/bundled/genomespace/genomespace_importer.py
diff --git a/tools/genomespace/genomespace_importer.xml b/lib/galaxy/tools/bundled/genomespace/genomespace_importer.xml
similarity index 100%
rename from tools/genomespace/genomespace_importer.xml
rename to lib/galaxy/tools/bundled/genomespace/genomespace_importer.xml
diff --git a/tools/maf/genebed_maf_to_fasta.xml b/lib/galaxy/tools/bundled/maf/genebed_maf_to_fasta.xml
similarity index 100%
rename from tools/maf/genebed_maf_to_fasta.xml
rename to lib/galaxy/tools/bundled/maf/genebed_maf_to_fasta.xml
diff --git a/tools/maf/interval2maf.py b/lib/galaxy/tools/bundled/maf/interval2maf.py
similarity index 100%
rename from tools/maf/interval2maf.py
rename to lib/galaxy/tools/bundled/maf/interval2maf.py
diff --git a/tools/maf/interval2maf.xml b/lib/galaxy/tools/bundled/maf/interval2maf.xml
similarity index 100%
rename from tools/maf/interval2maf.xml
rename to lib/galaxy/tools/bundled/maf/interval2maf.xml
diff --git a/tools/maf/interval2maf_pairwise.xml b/lib/galaxy/tools/bundled/maf/interval2maf_pairwise.xml
similarity index 100%
rename from tools/maf/interval2maf_pairwise.xml
rename to lib/galaxy/tools/bundled/maf/interval2maf_pairwise.xml
diff --git a/tools/maf/interval_maf_to_merged_fasta.py b/lib/galaxy/tools/bundled/maf/interval_maf_to_merged_fasta.py
similarity index 100%
rename from tools/maf/interval_maf_to_merged_fasta.py
rename to lib/galaxy/tools/bundled/maf/interval_maf_to_merged_fasta.py
diff --git a/tools/maf/interval_maf_to_merged_fasta.xml b/lib/galaxy/tools/bundled/maf/interval_maf_to_merged_fasta.xml
similarity index 100%
rename from tools/maf/interval_maf_to_merged_fasta.xml
rename to lib/galaxy/tools/bundled/maf/interval_maf_to_merged_fasta.xml
diff --git a/tools/maf/macros.xml b/lib/galaxy/tools/bundled/maf/macros.xml
similarity index 100%
rename from tools/maf/macros.xml
rename to lib/galaxy/tools/bundled/maf/macros.xml
diff --git a/tools/maf/maf_by_block_number.py b/lib/galaxy/tools/bundled/maf/maf_by_block_number.py
similarity index 100%
rename from tools/maf/maf_by_block_number.py
rename to lib/galaxy/tools/bundled/maf/maf_by_block_number.py
diff --git a/tools/maf/maf_by_block_number.xml b/lib/galaxy/tools/bundled/maf/maf_by_block_number.xml
similarity index 100%
rename from tools/maf/maf_by_block_number.xml
rename to lib/galaxy/tools/bundled/maf/maf_by_block_number.xml
diff --git a/tools/maf/maf_filter.py b/lib/galaxy/tools/bundled/maf/maf_filter.py
similarity index 100%
rename from tools/maf/maf_filter.py
rename to lib/galaxy/tools/bundled/maf/maf_filter.py
diff --git a/tools/maf/maf_filter.xml b/lib/galaxy/tools/bundled/maf/maf_filter.xml
similarity index 100%
rename from tools/maf/maf_filter.xml
rename to lib/galaxy/tools/bundled/maf/maf_filter.xml
diff --git a/tools/maf/maf_limit_size.py b/lib/galaxy/tools/bundled/maf/maf_limit_size.py
similarity index 100%
rename from tools/maf/maf_limit_size.py
rename to lib/galaxy/tools/bundled/maf/maf_limit_size.py
diff --git a/tools/maf/maf_limit_size.xml b/lib/galaxy/tools/bundled/maf/maf_limit_size.xml
similarity index 100%
rename from tools/maf/maf_limit_size.xml
rename to lib/galaxy/tools/bundled/maf/maf_limit_size.xml
diff --git a/tools/maf/maf_limit_to_species.py b/lib/galaxy/tools/bundled/maf/maf_limit_to_species.py
similarity index 100%
rename from tools/maf/maf_limit_to_species.py
rename to lib/galaxy/tools/bundled/maf/maf_limit_to_species.py
diff --git a/tools/maf/maf_limit_to_species.xml b/lib/galaxy/tools/bundled/maf/maf_limit_to_species.xml
similarity index 100%
rename from tools/maf/maf_limit_to_species.xml
rename to lib/galaxy/tools/bundled/maf/maf_limit_to_species.xml
diff --git a/tools/maf/maf_reverse_complement.py b/lib/galaxy/tools/bundled/maf/maf_reverse_complement.py
similarity index 100%
rename from tools/maf/maf_reverse_complement.py
rename to lib/galaxy/tools/bundled/maf/maf_reverse_complement.py
diff --git a/tools/maf/maf_reverse_complement.xml b/lib/galaxy/tools/bundled/maf/maf_reverse_complement.xml
similarity index 100%
rename from tools/maf/maf_reverse_complement.xml
rename to lib/galaxy/tools/bundled/maf/maf_reverse_complement.xml
diff --git a/tools/maf/maf_split_by_species.py b/lib/galaxy/tools/bundled/maf/maf_split_by_species.py
similarity index 100%
rename from tools/maf/maf_split_by_species.py
rename to lib/galaxy/tools/bundled/maf/maf_split_by_species.py
diff --git a/tools/maf/maf_split_by_species.xml b/lib/galaxy/tools/bundled/maf/maf_split_by_species.xml
similarity index 100%
rename from tools/maf/maf_split_by_species.xml
rename to lib/galaxy/tools/bundled/maf/maf_split_by_species.xml
diff --git a/tools/maf/maf_stats.py b/lib/galaxy/tools/bundled/maf/maf_stats.py
similarity index 100%
rename from tools/maf/maf_stats.py
rename to lib/galaxy/tools/bundled/maf/maf_stats.py
diff --git a/tools/maf/maf_stats.xml b/lib/galaxy/tools/bundled/maf/maf_stats.xml
similarity index 100%
rename from tools/maf/maf_stats.xml
rename to lib/galaxy/tools/bundled/maf/maf_stats.xml
diff --git a/tools/maf/maf_thread_for_species.py b/lib/galaxy/tools/bundled/maf/maf_thread_for_species.py
similarity index 100%
rename from tools/maf/maf_thread_for_species.py
rename to lib/galaxy/tools/bundled/maf/maf_thread_for_species.py
diff --git a/tools/maf/maf_thread_for_species.xml b/lib/galaxy/tools/bundled/maf/maf_thread_for_species.xml
similarity index 100%
rename from tools/maf/maf_thread_for_species.xml
rename to lib/galaxy/tools/bundled/maf/maf_thread_for_species.xml
diff --git a/tools/maf/maf_to_bed.py b/lib/galaxy/tools/bundled/maf/maf_to_bed.py
similarity index 100%
rename from tools/maf/maf_to_bed.py
rename to lib/galaxy/tools/bundled/maf/maf_to_bed.py
diff --git a/tools/maf/maf_to_bed.xml b/lib/galaxy/tools/bundled/maf/maf_to_bed.xml
similarity index 100%
rename from tools/maf/maf_to_bed.xml
rename to lib/galaxy/tools/bundled/maf/maf_to_bed.xml
diff --git a/tools/maf/maf_to_bed_code.py b/lib/galaxy/tools/bundled/maf/maf_to_bed_code.py
similarity index 100%
rename from tools/maf/maf_to_bed_code.py
rename to lib/galaxy/tools/bundled/maf/maf_to_bed_code.py
diff --git a/tools/maf/maf_to_fasta.xml b/lib/galaxy/tools/bundled/maf/maf_to_fasta.xml
similarity index 100%
rename from tools/maf/maf_to_fasta.xml
rename to lib/galaxy/tools/bundled/maf/maf_to_fasta.xml
diff --git a/tools/maf/maf_to_fasta_concat.py b/lib/galaxy/tools/bundled/maf/maf_to_fasta_concat.py
similarity index 100%
rename from tools/maf/maf_to_fasta_concat.py
rename to lib/galaxy/tools/bundled/maf/maf_to_fasta_concat.py
diff --git a/tools/maf/maf_to_fasta_multiple_sets.py b/lib/galaxy/tools/bundled/maf/maf_to_fasta_multiple_sets.py
similarity index 100%
rename from tools/maf/maf_to_fasta_multiple_sets.py
rename to lib/galaxy/tools/bundled/maf/maf_to_fasta_multiple_sets.py
diff --git a/tools/maf/maf_to_interval.py b/lib/galaxy/tools/bundled/maf/maf_to_interval.py
similarity index 100%
rename from tools/maf/maf_to_interval.py
rename to lib/galaxy/tools/bundled/maf/maf_to_interval.py
diff --git a/tools/maf/maf_to_interval.xml b/lib/galaxy/tools/bundled/maf/maf_to_interval.xml
similarity index 100%
rename from tools/maf/maf_to_interval.xml
rename to lib/galaxy/tools/bundled/maf/maf_to_interval.xml
diff --git a/tools/maf/vcf_to_maf_customtrack.py b/lib/galaxy/tools/bundled/maf/vcf_to_maf_customtrack.py
similarity index 100%
rename from tools/maf/vcf_to_maf_customtrack.py
rename to lib/galaxy/tools/bundled/maf/vcf_to_maf_customtrack.py
diff --git a/tools/maf/vcf_to_maf_customtrack.xml b/lib/galaxy/tools/bundled/maf/vcf_to_maf_customtrack.xml
similarity index 100%
rename from tools/maf/vcf_to_maf_customtrack.xml
rename to lib/galaxy/tools/bundled/maf/vcf_to_maf_customtrack.xml
diff --git a/tools/meme/fimo.xml b/lib/galaxy/tools/bundled/meme/fimo.xml
similarity index 100%
rename from tools/meme/fimo.xml
rename to lib/galaxy/tools/bundled/meme/fimo.xml
diff --git a/tools/meme/fimo_wrapper.py b/lib/galaxy/tools/bundled/meme/fimo_wrapper.py
similarity index 100%
rename from tools/meme/fimo_wrapper.py
rename to lib/galaxy/tools/bundled/meme/fimo_wrapper.py
diff --git a/tools/meme/meme.xml b/lib/galaxy/tools/bundled/meme/meme.xml
similarity index 100%
rename from tools/meme/meme.xml
rename to lib/galaxy/tools/bundled/meme/meme.xml
diff --git a/tools/metag_tools/blat_wrapper.py b/lib/galaxy/tools/bundled/metag_tools/blat_wrapper.py
similarity index 100%
rename from tools/metag_tools/blat_wrapper.py
rename to lib/galaxy/tools/bundled/metag_tools/blat_wrapper.py
diff --git a/tools/metag_tools/blat_wrapper.xml b/lib/galaxy/tools/bundled/metag_tools/blat_wrapper.xml
similarity index 100%
rename from tools/metag_tools/blat_wrapper.xml
rename to lib/galaxy/tools/bundled/metag_tools/blat_wrapper.xml
diff --git a/tools/metag_tools/shrimp_color_wrapper.py b/lib/galaxy/tools/bundled/metag_tools/shrimp_color_wrapper.py
similarity index 100%
rename from tools/metag_tools/shrimp_color_wrapper.py
rename to lib/galaxy/tools/bundled/metag_tools/shrimp_color_wrapper.py
diff --git a/tools/metag_tools/shrimp_color_wrapper.xml b/lib/galaxy/tools/bundled/metag_tools/shrimp_color_wrapper.xml
similarity index 100%
rename from tools/metag_tools/shrimp_color_wrapper.xml
rename to lib/galaxy/tools/bundled/metag_tools/shrimp_color_wrapper.xml
diff --git a/tools/metag_tools/shrimp_wrapper.py b/lib/galaxy/tools/bundled/metag_tools/shrimp_wrapper.py
similarity index 100%
rename from tools/metag_tools/shrimp_wrapper.py
rename to lib/galaxy/tools/bundled/metag_tools/shrimp_wrapper.py
diff --git a/tools/metag_tools/shrimp_wrapper.xml b/lib/galaxy/tools/bundled/metag_tools/shrimp_wrapper.xml
similarity index 100%
rename from tools/metag_tools/shrimp_wrapper.xml
rename to lib/galaxy/tools/bundled/metag_tools/shrimp_wrapper.xml
diff --git a/tools/next_gen_conversion/bwa_solid2fastq_modified.pl b/lib/galaxy/tools/bundled/next_gen_conversion/bwa_solid2fastq_modified.pl
similarity index 100%
rename from tools/next_gen_conversion/bwa_solid2fastq_modified.pl
rename to lib/galaxy/tools/bundled/next_gen_conversion/bwa_solid2fastq_modified.pl
diff --git a/tools/next_gen_conversion/fastq_conversions.py b/lib/galaxy/tools/bundled/next_gen_conversion/fastq_conversions.py
similarity index 100%
rename from tools/next_gen_conversion/fastq_conversions.py
rename to lib/galaxy/tools/bundled/next_gen_conversion/fastq_conversions.py
diff --git a/tools/next_gen_conversion/fastq_conversions.xml b/lib/galaxy/tools/bundled/next_gen_conversion/fastq_conversions.xml
similarity index 100%
rename from tools/next_gen_conversion/fastq_conversions.xml
rename to lib/galaxy/tools/bundled/next_gen_conversion/fastq_conversions.xml
diff --git a/tools/next_gen_conversion/fastq_gen_conv.py b/lib/galaxy/tools/bundled/next_gen_conversion/fastq_gen_conv.py
similarity index 100%
rename from tools/next_gen_conversion/fastq_gen_conv.py
rename to lib/galaxy/tools/bundled/next_gen_conversion/fastq_gen_conv.py
diff --git a/tools/next_gen_conversion/fastq_gen_conv.xml b/lib/galaxy/tools/bundled/next_gen_conversion/fastq_gen_conv.xml
similarity index 100%
rename from tools/next_gen_conversion/fastq_gen_conv.xml
rename to lib/galaxy/tools/bundled/next_gen_conversion/fastq_gen_conv.xml
diff --git a/tools/next_gen_conversion/solid2fastq.py b/lib/galaxy/tools/bundled/next_gen_conversion/solid2fastq.py
similarity index 100%
rename from tools/next_gen_conversion/solid2fastq.py
rename to lib/galaxy/tools/bundled/next_gen_conversion/solid2fastq.py
diff --git a/tools/next_gen_conversion/solid2fastq.xml b/lib/galaxy/tools/bundled/next_gen_conversion/solid2fastq.xml
similarity index 100%
rename from tools/next_gen_conversion/solid2fastq.xml
rename to lib/galaxy/tools/bundled/next_gen_conversion/solid2fastq.xml
diff --git a/tools/next_gen_conversion/solid_to_fastq.py b/lib/galaxy/tools/bundled/next_gen_conversion/solid_to_fastq.py
similarity index 100%
rename from tools/next_gen_conversion/solid_to_fastq.py
rename to lib/galaxy/tools/bundled/next_gen_conversion/solid_to_fastq.py
diff --git a/tools/next_gen_conversion/solid_to_fastq.xml b/lib/galaxy/tools/bundled/next_gen_conversion/solid_to_fastq.xml
similarity index 100%
rename from tools/next_gen_conversion/solid_to_fastq.xml
rename to lib/galaxy/tools/bundled/next_gen_conversion/solid_to_fastq.xml
diff --git a/tools/ngs_simulation/ngs_simulation.py b/lib/galaxy/tools/bundled/ngs_simulation/ngs_simulation.py
similarity index 100%
rename from tools/ngs_simulation/ngs_simulation.py
rename to lib/galaxy/tools/bundled/ngs_simulation/ngs_simulation.py
diff --git a/tools/ngs_simulation/ngs_simulation.xml b/lib/galaxy/tools/bundled/ngs_simulation/ngs_simulation.xml
similarity index 100%
rename from tools/ngs_simulation/ngs_simulation.xml
rename to lib/galaxy/tools/bundled/ngs_simulation/ngs_simulation.xml
diff --git a/tools/phenotype_association/BEAM2_wrapper.sh b/lib/galaxy/tools/bundled/phenotype_association/BEAM2_wrapper.sh
similarity index 100%
rename from tools/phenotype_association/BEAM2_wrapper.sh
rename to lib/galaxy/tools/bundled/phenotype_association/BEAM2_wrapper.sh
diff --git a/tools/phenotype_association/beam.xml b/lib/galaxy/tools/bundled/phenotype_association/beam.xml
similarity index 100%
rename from tools/phenotype_association/beam.xml
rename to lib/galaxy/tools/bundled/phenotype_association/beam.xml
diff --git a/tools/phenotype_association/gpass.pl b/lib/galaxy/tools/bundled/phenotype_association/gpass.pl
similarity index 100%
rename from tools/phenotype_association/gpass.pl
rename to lib/galaxy/tools/bundled/phenotype_association/gpass.pl
diff --git a/tools/phenotype_association/gpass.xml b/lib/galaxy/tools/bundled/phenotype_association/gpass.xml
similarity index 100%
rename from tools/phenotype_association/gpass.xml
rename to lib/galaxy/tools/bundled/phenotype_association/gpass.xml
diff --git a/tools/phenotype_association/ldtools.xml b/lib/galaxy/tools/bundled/phenotype_association/ldtools.xml
similarity index 100%
rename from tools/phenotype_association/ldtools.xml
rename to lib/galaxy/tools/bundled/phenotype_association/ldtools.xml
diff --git a/tools/phenotype_association/ldtools_wrapper.sh b/lib/galaxy/tools/bundled/phenotype_association/ldtools_wrapper.sh
similarity index 100%
rename from tools/phenotype_association/ldtools_wrapper.sh
rename to lib/galaxy/tools/bundled/phenotype_association/ldtools_wrapper.sh
diff --git a/tools/phenotype_association/linkToDavid.pl b/lib/galaxy/tools/bundled/phenotype_association/linkToDavid.pl
similarity index 100%
rename from tools/phenotype_association/linkToDavid.pl
rename to lib/galaxy/tools/bundled/phenotype_association/linkToDavid.pl
diff --git a/tools/phenotype_association/linkToDavid.xml b/lib/galaxy/tools/bundled/phenotype_association/linkToDavid.xml
similarity index 100%
rename from tools/phenotype_association/linkToDavid.xml
rename to lib/galaxy/tools/bundled/phenotype_association/linkToDavid.xml
diff --git a/tools/phenotype_association/linkToGProfile.pl b/lib/galaxy/tools/bundled/phenotype_association/linkToGProfile.pl
similarity index 100%
rename from tools/phenotype_association/linkToGProfile.pl
rename to lib/galaxy/tools/bundled/phenotype_association/linkToGProfile.pl
diff --git a/tools/phenotype_association/linkToGProfile.xml b/lib/galaxy/tools/bundled/phenotype_association/linkToGProfile.xml
similarity index 100%
rename from tools/phenotype_association/linkToGProfile.xml
rename to lib/galaxy/tools/bundled/phenotype_association/linkToGProfile.xml
diff --git a/tools/phenotype_association/lped_to_geno.pl b/lib/galaxy/tools/bundled/phenotype_association/lped_to_geno.pl
similarity index 100%
rename from tools/phenotype_association/lped_to_geno.pl
rename to lib/galaxy/tools/bundled/phenotype_association/lped_to_geno.pl
diff --git a/tools/phenotype_association/lps.xml b/lib/galaxy/tools/bundled/phenotype_association/lps.xml
similarity index 100%
rename from tools/phenotype_association/lps.xml
rename to lib/galaxy/tools/bundled/phenotype_association/lps.xml
diff --git a/tools/phenotype_association/lps_tool_wrapper.sh b/lib/galaxy/tools/bundled/phenotype_association/lps_tool_wrapper.sh
similarity index 100%
rename from tools/phenotype_association/lps_tool_wrapper.sh
rename to lib/galaxy/tools/bundled/phenotype_association/lps_tool_wrapper.sh
diff --git a/tools/phenotype_association/master2gd_snp.pl b/lib/galaxy/tools/bundled/phenotype_association/master2gd_snp.pl
similarity index 100%
rename from tools/phenotype_association/master2gd_snp.pl
rename to lib/galaxy/tools/bundled/phenotype_association/master2gd_snp.pl
diff --git a/tools/phenotype_association/master2gd_snp.xml b/lib/galaxy/tools/bundled/phenotype_association/master2gd_snp.xml
similarity index 100%
rename from tools/phenotype_association/master2gd_snp.xml
rename to lib/galaxy/tools/bundled/phenotype_association/master2gd_snp.xml
diff --git a/tools/phenotype_association/master2pg.pl b/lib/galaxy/tools/bundled/phenotype_association/master2pg.pl
similarity index 100%
rename from tools/phenotype_association/master2pg.pl
rename to lib/galaxy/tools/bundled/phenotype_association/master2pg.pl
diff --git a/tools/phenotype_association/master2pg.xml b/lib/galaxy/tools/bundled/phenotype_association/master2pg.xml
similarity index 100%
rename from tools/phenotype_association/master2pg.xml
rename to lib/galaxy/tools/bundled/phenotype_association/master2pg.xml
diff --git a/tools/phenotype_association/mergeSnps.pl b/lib/galaxy/tools/bundled/phenotype_association/mergeSnps.pl
similarity index 100%
rename from tools/phenotype_association/mergeSnps.pl
rename to lib/galaxy/tools/bundled/phenotype_association/mergeSnps.pl
diff --git a/tools/phenotype_association/pagetag.py b/lib/galaxy/tools/bundled/phenotype_association/pagetag.py
similarity index 100%
rename from tools/phenotype_association/pagetag.py
rename to lib/galaxy/tools/bundled/phenotype_association/pagetag.py
diff --git a/tools/phenotype_association/pass.xml b/lib/galaxy/tools/bundled/phenotype_association/pass.xml
similarity index 100%
rename from tools/phenotype_association/pass.xml
rename to lib/galaxy/tools/bundled/phenotype_association/pass.xml
diff --git a/tools/phenotype_association/pass_wrapper.sh b/lib/galaxy/tools/bundled/phenotype_association/pass_wrapper.sh
similarity index 100%
rename from tools/phenotype_association/pass_wrapper.sh
rename to lib/galaxy/tools/bundled/phenotype_association/pass_wrapper.sh
diff --git a/tools/phenotype_association/senatag.py b/lib/galaxy/tools/bundled/phenotype_association/senatag.py
similarity index 100%
rename from tools/phenotype_association/senatag.py
rename to lib/galaxy/tools/bundled/phenotype_association/senatag.py
diff --git a/tools/phenotype_association/sift.xml b/lib/galaxy/tools/bundled/phenotype_association/sift.xml
similarity index 100%
rename from tools/phenotype_association/sift.xml
rename to lib/galaxy/tools/bundled/phenotype_association/sift.xml
diff --git a/tools/phenotype_association/sift_variants_wrapper.sh b/lib/galaxy/tools/bundled/phenotype_association/sift_variants_wrapper.sh
similarity index 100%
rename from tools/phenotype_association/sift_variants_wrapper.sh
rename to lib/galaxy/tools/bundled/phenotype_association/sift_variants_wrapper.sh
diff --git a/tools/phenotype_association/vcf2pgSnpMult.pl b/lib/galaxy/tools/bundled/phenotype_association/vcf2pgSnpMult.pl
similarity index 100%
rename from tools/phenotype_association/vcf2pgSnpMult.pl
rename to lib/galaxy/tools/bundled/phenotype_association/vcf2pgSnpMult.pl
diff --git a/tools/plotting/bar_chart.py b/lib/galaxy/tools/bundled/plotting/bar_chart.py
similarity index 100%
rename from tools/plotting/bar_chart.py
rename to lib/galaxy/tools/bundled/plotting/bar_chart.py
diff --git a/tools/plotting/bar_chart.xml b/lib/galaxy/tools/bundled/plotting/bar_chart.xml
similarity index 100%
rename from tools/plotting/bar_chart.xml
rename to lib/galaxy/tools/bundled/plotting/bar_chart.xml
diff --git a/tools/plotting/boxplot.xml b/lib/galaxy/tools/bundled/plotting/boxplot.xml
similarity index 100%
rename from tools/plotting/boxplot.xml
rename to lib/galaxy/tools/bundled/plotting/boxplot.xml
diff --git a/tools/solid_tools/maq_cs_wrapper.py b/lib/galaxy/tools/bundled/solid_tools/maq_cs_wrapper.py
similarity index 100%
rename from tools/solid_tools/maq_cs_wrapper.py
rename to lib/galaxy/tools/bundled/solid_tools/maq_cs_wrapper.py
diff --git a/tools/solid_tools/maq_cs_wrapper.xml b/lib/galaxy/tools/bundled/solid_tools/maq_cs_wrapper.xml
similarity index 100%
rename from tools/solid_tools/maq_cs_wrapper.xml
rename to lib/galaxy/tools/bundled/solid_tools/maq_cs_wrapper.xml
diff --git a/tools/solid_tools/maq_cs_wrapper_code.py b/lib/galaxy/tools/bundled/solid_tools/maq_cs_wrapper_code.py
similarity index 100%
rename from tools/solid_tools/maq_cs_wrapper_code.py
rename to lib/galaxy/tools/bundled/solid_tools/maq_cs_wrapper_code.py
diff --git a/tools/solid_tools/qualsolid_boxplot_graph.sh b/lib/galaxy/tools/bundled/solid_tools/qualsolid_boxplot_graph.sh
similarity index 100%
rename from tools/solid_tools/qualsolid_boxplot_graph.sh
rename to lib/galaxy/tools/bundled/solid_tools/qualsolid_boxplot_graph.sh
diff --git a/tools/solid_tools/solid_qual_boxplot.xml b/lib/galaxy/tools/bundled/solid_tools/solid_qual_boxplot.xml
similarity index 100%
rename from tools/solid_tools/solid_qual_boxplot.xml
rename to lib/galaxy/tools/bundled/solid_tools/solid_qual_boxplot.xml
diff --git a/tools/solid_tools/solid_qual_stats.py b/lib/galaxy/tools/bundled/solid_tools/solid_qual_stats.py
similarity index 100%
rename from tools/solid_tools/solid_qual_stats.py
rename to lib/galaxy/tools/bundled/solid_tools/solid_qual_stats.py
diff --git a/tools/solid_tools/solid_qual_stats.xml b/lib/galaxy/tools/bundled/solid_tools/solid_qual_stats.xml
similarity index 100%
rename from tools/solid_tools/solid_qual_stats.xml
rename to lib/galaxy/tools/bundled/solid_tools/solid_qual_stats.xml
diff --git a/tools/sr_assembly/velvetg.xml b/lib/galaxy/tools/bundled/sr_assembly/velvetg.xml
similarity index 100%
rename from tools/sr_assembly/velvetg.xml
rename to lib/galaxy/tools/bundled/sr_assembly/velvetg.xml
diff --git a/tools/sr_assembly/velvetg_wrapper.py b/lib/galaxy/tools/bundled/sr_assembly/velvetg_wrapper.py
similarity index 100%
rename from tools/sr_assembly/velvetg_wrapper.py
rename to lib/galaxy/tools/bundled/sr_assembly/velvetg_wrapper.py
diff --git a/tools/sr_assembly/velveth.xml b/lib/galaxy/tools/bundled/sr_assembly/velveth.xml
similarity index 100%
rename from tools/sr_assembly/velveth.xml
rename to lib/galaxy/tools/bundled/sr_assembly/velveth.xml
diff --git a/tools/sr_assembly/velveth_wrapper.py b/lib/galaxy/tools/bundled/sr_assembly/velveth_wrapper.py
similarity index 100%
rename from tools/sr_assembly/velveth_wrapper.py
rename to lib/galaxy/tools/bundled/sr_assembly/velveth_wrapper.py
diff --git a/tools/sr_mapping/PerM.xml b/lib/galaxy/tools/bundled/sr_mapping/PerM.xml
similarity index 100%
rename from tools/sr_mapping/PerM.xml
rename to lib/galaxy/tools/bundled/sr_mapping/PerM.xml
diff --git a/tools/sr_mapping/bfast_wrapper.py b/lib/galaxy/tools/bundled/sr_mapping/bfast_wrapper.py
similarity index 100%
rename from tools/sr_mapping/bfast_wrapper.py
rename to lib/galaxy/tools/bundled/sr_mapping/bfast_wrapper.py
diff --git a/tools/sr_mapping/bfast_wrapper.xml b/lib/galaxy/tools/bundled/sr_mapping/bfast_wrapper.xml
similarity index 100%
rename from tools/sr_mapping/bfast_wrapper.xml
rename to lib/galaxy/tools/bundled/sr_mapping/bfast_wrapper.xml
diff --git a/tools/sr_mapping/fastq_statistics.xml b/lib/galaxy/tools/bundled/sr_mapping/fastq_statistics.xml
similarity index 100%
rename from tools/sr_mapping/fastq_statistics.xml
rename to lib/galaxy/tools/bundled/sr_mapping/fastq_statistics.xml
diff --git a/tools/sr_mapping/mosaik.xml b/lib/galaxy/tools/bundled/sr_mapping/mosaik.xml
similarity index 100%
rename from tools/sr_mapping/mosaik.xml
rename to lib/galaxy/tools/bundled/sr_mapping/mosaik.xml
diff --git a/tools/sr_mapping/srma_wrapper.py b/lib/galaxy/tools/bundled/sr_mapping/srma_wrapper.py
similarity index 100%
rename from tools/sr_mapping/srma_wrapper.py
rename to lib/galaxy/tools/bundled/sr_mapping/srma_wrapper.py
diff --git a/tools/sr_mapping/srma_wrapper.xml b/lib/galaxy/tools/bundled/sr_mapping/srma_wrapper.xml
similarity index 100%
rename from tools/sr_mapping/srma_wrapper.xml
rename to lib/galaxy/tools/bundled/sr_mapping/srma_wrapper.xml
diff --git a/tools/stats/aggregate_binned_scores_in_intervals.xml b/lib/galaxy/tools/bundled/stats/aggregate_binned_scores_in_intervals.xml
similarity index 100%
rename from tools/stats/aggregate_binned_scores_in_intervals.xml
rename to lib/galaxy/tools/bundled/stats/aggregate_binned_scores_in_intervals.xml
diff --git a/tools/stats/aggregate_scores_in_intervals.py b/lib/galaxy/tools/bundled/stats/aggregate_scores_in_intervals.py
similarity index 100%
rename from tools/stats/aggregate_scores_in_intervals.py
rename to lib/galaxy/tools/bundled/stats/aggregate_scores_in_intervals.py
diff --git a/tools/stats/filtering.py b/lib/galaxy/tools/bundled/stats/filtering.py
similarity index 100%
rename from tools/stats/filtering.py
rename to lib/galaxy/tools/bundled/stats/filtering.py
diff --git a/tools/stats/filtering.xml b/lib/galaxy/tools/bundled/stats/filtering.xml
similarity index 100%
rename from tools/stats/filtering.xml
rename to lib/galaxy/tools/bundled/stats/filtering.xml
diff --git a/tools/stats/grouping.py b/lib/galaxy/tools/bundled/stats/grouping.py
similarity index 100%
rename from tools/stats/grouping.py
rename to lib/galaxy/tools/bundled/stats/grouping.py
diff --git a/tools/stats/grouping.xml b/lib/galaxy/tools/bundled/stats/grouping.xml
similarity index 100%
rename from tools/stats/grouping.xml
rename to lib/galaxy/tools/bundled/stats/grouping.xml
diff --git a/tools/stats/gsummary.py b/lib/galaxy/tools/bundled/stats/gsummary.py
similarity index 100%
rename from tools/stats/gsummary.py
rename to lib/galaxy/tools/bundled/stats/gsummary.py
diff --git a/tools/stats/gsummary.xml b/lib/galaxy/tools/bundled/stats/gsummary.xml
similarity index 100%
rename from tools/stats/gsummary.xml
rename to lib/galaxy/tools/bundled/stats/gsummary.xml
diff --git a/tools/stats/gsummary.xml.groups b/lib/galaxy/tools/bundled/stats/gsummary.xml.groups
similarity index 100%
rename from tools/stats/gsummary.xml.groups
rename to lib/galaxy/tools/bundled/stats/gsummary.xml.groups
diff --git a/tools/stats/r_wrapper.sh b/lib/galaxy/tools/bundled/stats/r_wrapper.sh
similarity index 100%
rename from tools/stats/r_wrapper.sh
rename to lib/galaxy/tools/bundled/stats/r_wrapper.sh
diff --git a/tools/visualization/LAJ.py b/lib/galaxy/tools/bundled/visualization/LAJ.py
similarity index 100%
rename from tools/visualization/LAJ.py
rename to lib/galaxy/tools/bundled/visualization/LAJ.py
diff --git a/tools/visualization/LAJ.xml b/lib/galaxy/tools/bundled/visualization/LAJ.xml
similarity index 100%
rename from tools/visualization/LAJ.xml
rename to lib/galaxy/tools/bundled/visualization/LAJ.xml
diff --git a/tools/visualization/LAJ_code.py b/lib/galaxy/tools/bundled/visualization/LAJ_code.py
similarity index 100%
rename from tools/visualization/LAJ_code.py
rename to lib/galaxy/tools/bundled/visualization/LAJ_code.py
diff --git a/static/images/Armitagep_manhattan.png b/lib/galaxy/web/framework/static/images/Armitagep_manhattan.png
similarity index 100%
rename from static/images/Armitagep_manhattan.png
rename to lib/galaxy/web/framework/static/images/Armitagep_manhattan.png
diff --git a/static/images/Armitagep_qqplot.png b/lib/galaxy/web/framework/static/images/Armitagep_qqplot.png
similarity index 100%
rename from static/images/Armitagep_qqplot.png
rename to lib/galaxy/web/framework/static/images/Armitagep_qqplot.png
diff --git a/static/images/add_icon.png b/lib/galaxy/web/framework/static/images/add_icon.png
similarity index 100%
rename from static/images/add_icon.png
rename to lib/galaxy/web/framework/static/images/add_icon.png
diff --git a/static/images/add_icon_dark.png b/lib/galaxy/web/framework/static/images/add_icon_dark.png
similarity index 100%
rename from static/images/add_icon_dark.png
rename to lib/galaxy/web/framework/static/images/add_icon_dark.png
diff --git a/static/images/aggregate_history1.png b/lib/galaxy/web/framework/static/images/aggregate_history1.png
similarity index 100%
rename from static/images/aggregate_history1.png
rename to lib/galaxy/web/framework/static/images/aggregate_history1.png
diff --git a/static/images/aggregate_history2.png b/lib/galaxy/web/framework/static/images/aggregate_history2.png
similarity index 100%
rename from static/images/aggregate_history2.png
rename to lib/galaxy/web/framework/static/images/aggregate_history2.png
diff --git a/static/images/bar_chart.png b/lib/galaxy/web/framework/static/images/bar_chart.png
similarity index 100%
rename from static/images/bar_chart.png
rename to lib/galaxy/web/framework/static/images/bar_chart.png
diff --git a/static/images/bed_warn.png b/lib/galaxy/web/framework/static/images/bed_warn.png
similarity index 100%
rename from static/images/bed_warn.png
rename to lib/galaxy/web/framework/static/images/bed_warn.png
diff --git a/static/images/closebox.png b/lib/galaxy/web/framework/static/images/closebox.png
similarity index 100%
rename from static/images/closebox.png
rename to lib/galaxy/web/framework/static/images/closebox.png
diff --git a/static/images/dat_points_table_brows_1.png b/lib/galaxy/web/framework/static/images/dat_points_table_brows_1.png
similarity index 100%
rename from static/images/dat_points_table_brows_1.png
rename to lib/galaxy/web/framework/static/images/dat_points_table_brows_1.png
diff --git a/static/images/ddarrowsplit.png b/lib/galaxy/web/framework/static/images/ddarrowsplit.png
similarity index 100%
rename from static/images/ddarrowsplit.png
rename to lib/galaxy/web/framework/static/images/ddarrowsplit.png
diff --git a/static/images/delete.gif b/lib/galaxy/web/framework/static/images/delete.gif
similarity index 100%
rename from static/images/delete.gif
rename to lib/galaxy/web/framework/static/images/delete.gif
diff --git a/static/images/delete_tag_icon_gray.png b/lib/galaxy/web/framework/static/images/delete_tag_icon_gray.png
similarity index 100%
rename from static/images/delete_tag_icon_gray.png
rename to lib/galaxy/web/framework/static/images/delete_tag_icon_gray.png
diff --git a/static/images/delete_tag_icon_white.png b/lib/galaxy/web/framework/static/images/delete_tag_icon_white.png
similarity index 100%
rename from static/images/delete_tag_icon_white.png
rename to lib/galaxy/web/framework/static/images/delete_tag_icon_white.png
diff --git a/static/images/documents-stack-faded.png b/lib/galaxy/web/framework/static/images/documents-stack-faded.png
similarity index 100%
rename from static/images/documents-stack-faded.png
rename to lib/galaxy/web/framework/static/images/documents-stack-faded.png
diff --git a/static/images/documents-stack.png b/lib/galaxy/web/framework/static/images/documents-stack.png
similarity index 100%
rename from static/images/documents-stack.png
rename to lib/galaxy/web/framework/static/images/documents-stack.png
diff --git a/static/images/dropdownarrow.png b/lib/galaxy/web/framework/static/images/dropdownarrow.png
similarity index 100%
rename from static/images/dropdownarrow.png
rename to lib/galaxy/web/framework/static/images/dropdownarrow.png
diff --git a/static/images/dw.gif b/lib/galaxy/web/framework/static/images/dw.gif
similarity index 100%
rename from static/images/dw.gif
rename to lib/galaxy/web/framework/static/images/dw.gif
diff --git a/static/images/fetchTax.png b/lib/galaxy/web/framework/static/images/fetchTax.png
similarity index 100%
rename from static/images/fetchTax.png
rename to lib/galaxy/web/framework/static/images/fetchTax.png
diff --git a/static/images/fonts/fontawesome-webfont.eot b/lib/galaxy/web/framework/static/images/fonts/fontawesome-webfont.eot
similarity index 100%
rename from static/images/fonts/fontawesome-webfont.eot
rename to lib/galaxy/web/framework/static/images/fonts/fontawesome-webfont.eot
diff --git a/static/images/fonts/fontawesome-webfont.ttf b/lib/galaxy/web/framework/static/images/fonts/fontawesome-webfont.ttf
similarity index 100%
rename from static/images/fonts/fontawesome-webfont.ttf
rename to lib/galaxy/web/framework/static/images/fonts/fontawesome-webfont.ttf
diff --git a/static/images/fonts/fontawesome-webfont.woff b/lib/galaxy/web/framework/static/images/fonts/fontawesome-webfont.woff
similarity index 100%
rename from static/images/fonts/fontawesome-webfont.woff
rename to lib/galaxy/web/framework/static/images/fonts/fontawesome-webfont.woff
diff --git a/static/images/fonts/iconic_stroke.eot b/lib/galaxy/web/framework/static/images/fonts/iconic_stroke.eot
similarity index 100%
rename from static/images/fonts/iconic_stroke.eot
rename to lib/galaxy/web/framework/static/images/fonts/iconic_stroke.eot
diff --git a/static/images/fonts/iconic_stroke.otf b/lib/galaxy/web/framework/static/images/fonts/iconic_stroke.otf
similarity index 100%
rename from static/images/fonts/iconic_stroke.otf
rename to lib/galaxy/web/framework/static/images/fonts/iconic_stroke.otf
diff --git a/static/images/fonts/iconic_stroke.svg b/lib/galaxy/web/framework/static/images/fonts/iconic_stroke.svg
similarity index 100%
rename from static/images/fonts/iconic_stroke.svg
rename to lib/galaxy/web/framework/static/images/fonts/iconic_stroke.svg
diff --git a/static/images/fonts/iconic_stroke.ttf b/lib/galaxy/web/framework/static/images/fonts/iconic_stroke.ttf
similarity index 100%
rename from static/images/fonts/iconic_stroke.ttf
rename to lib/galaxy/web/framework/static/images/fonts/iconic_stroke.ttf
diff --git a/static/images/fugue/application-dock-270-bw.png b/lib/galaxy/web/framework/static/images/fugue/application-dock-270-bw.png
similarity index 100%
rename from static/images/fugue/application-dock-270-bw.png
rename to lib/galaxy/web/framework/static/images/fugue/application-dock-270-bw.png
diff --git a/static/images/fugue/application-dock-270.png b/lib/galaxy/web/framework/static/images/fugue/application-dock-270.png
similarity index 100%
rename from static/images/fugue/application-dock-270.png
rename to lib/galaxy/web/framework/static/images/fugue/application-dock-270.png
diff --git a/static/images/fugue/arrow-000-small-bw.png b/lib/galaxy/web/framework/static/images/fugue/arrow-000-small-bw.png
similarity index 100%
rename from static/images/fugue/arrow-000-small-bw.png
rename to lib/galaxy/web/framework/static/images/fugue/arrow-000-small-bw.png
diff --git a/static/images/fugue/arrow-090.png b/lib/galaxy/web/framework/static/images/fugue/arrow-090.png
similarity index 100%
rename from static/images/fugue/arrow-090.png
rename to lib/galaxy/web/framework/static/images/fugue/arrow-090.png
diff --git a/static/images/fugue/arrow-circle.png b/lib/galaxy/web/framework/static/images/fugue/arrow-circle.png
similarity index 100%
rename from static/images/fugue/arrow-circle.png
rename to lib/galaxy/web/framework/static/images/fugue/arrow-circle.png
diff --git a/static/images/fugue/arrow-resize-090-bw.png b/lib/galaxy/web/framework/static/images/fugue/arrow-resize-090-bw.png
similarity index 100%
rename from static/images/fugue/arrow-resize-090-bw.png
rename to lib/galaxy/web/framework/static/images/fugue/arrow-resize-090-bw.png
diff --git a/static/images/fugue/arrow-resize-090.png b/lib/galaxy/web/framework/static/images/fugue/arrow-resize-090.png
similarity index 100%
rename from static/images/fugue/arrow-resize-090.png
rename to lib/galaxy/web/framework/static/images/fugue/arrow-resize-090.png
diff --git a/static/images/fugue/arrow-split-bw.png b/lib/galaxy/web/framework/static/images/fugue/arrow-split-bw.png
similarity index 100%
rename from static/images/fugue/arrow-split-bw.png
rename to lib/galaxy/web/framework/static/images/fugue/arrow-split-bw.png
diff --git a/static/images/fugue/arrow-split.png b/lib/galaxy/web/framework/static/images/fugue/arrow-split.png
similarity index 100%
rename from static/images/fugue/arrow-split.png
rename to lib/galaxy/web/framework/static/images/fugue/arrow-split.png
diff --git a/static/images/fugue/arrow-transition-270-bw.png b/lib/galaxy/web/framework/static/images/fugue/arrow-transition-270-bw.png
similarity index 100%
rename from static/images/fugue/arrow-transition-270-bw.png
rename to lib/galaxy/web/framework/static/images/fugue/arrow-transition-270-bw.png
diff --git a/static/images/fugue/arrow-transition-bw.png b/lib/galaxy/web/framework/static/images/fugue/arrow-transition-bw.png
similarity index 100%
rename from static/images/fugue/arrow-transition-bw.png
rename to lib/galaxy/web/framework/static/images/fugue/arrow-transition-bw.png
diff --git a/static/images/fugue/asterisk-small-outline.png b/lib/galaxy/web/framework/static/images/fugue/asterisk-small-outline.png
similarity index 100%
rename from static/images/fugue/asterisk-small-outline.png
rename to lib/galaxy/web/framework/static/images/fugue/asterisk-small-outline.png
diff --git a/static/images/fugue/asterisk-small-yellow.png b/lib/galaxy/web/framework/static/images/fugue/asterisk-small-yellow.png
similarity index 100%
rename from static/images/fugue/asterisk-small-yellow.png
rename to lib/galaxy/web/framework/static/images/fugue/asterisk-small-yellow.png
diff --git a/static/images/fugue/asterisk-small.png b/lib/galaxy/web/framework/static/images/fugue/asterisk-small.png
similarity index 100%
rename from static/images/fugue/asterisk-small.png
rename to lib/galaxy/web/framework/static/images/fugue/asterisk-small.png
diff --git a/static/images/fugue/block--plus-bw.png b/lib/galaxy/web/framework/static/images/fugue/block--plus-bw.png
similarity index 100%
rename from static/images/fugue/block--plus-bw.png
rename to lib/galaxy/web/framework/static/images/fugue/block--plus-bw.png
diff --git a/static/images/fugue/block--plus.png b/lib/galaxy/web/framework/static/images/fugue/block--plus.png
similarity index 100%
rename from static/images/fugue/block--plus.png
rename to lib/galaxy/web/framework/static/images/fugue/block--plus.png
diff --git a/static/images/fugue/bookmarks-bw.png b/lib/galaxy/web/framework/static/images/fugue/bookmarks-bw.png
similarity index 100%
rename from static/images/fugue/bookmarks-bw.png
rename to lib/galaxy/web/framework/static/images/fugue/bookmarks-bw.png
diff --git a/static/images/fugue/bookmarks.png b/lib/galaxy/web/framework/static/images/fugue/bookmarks.png
similarity index 100%
rename from static/images/fugue/bookmarks.png
rename to lib/galaxy/web/framework/static/images/fugue/bookmarks.png
diff --git a/static/images/fugue/bug.png b/lib/galaxy/web/framework/static/images/fugue/bug.png
similarity index 100%
rename from static/images/fugue/bug.png
rename to lib/galaxy/web/framework/static/images/fugue/bug.png
diff --git a/static/images/fugue/chart.png b/lib/galaxy/web/framework/static/images/fugue/chart.png
similarity index 100%
rename from static/images/fugue/chart.png
rename to lib/galaxy/web/framework/static/images/fugue/chart.png
diff --git a/static/images/fugue/chevron-expand-bw.png b/lib/galaxy/web/framework/static/images/fugue/chevron-expand-bw.png
similarity index 100%
rename from static/images/fugue/chevron-expand-bw.png
rename to lib/galaxy/web/framework/static/images/fugue/chevron-expand-bw.png
diff --git a/static/images/fugue/chevron-expand.png b/lib/galaxy/web/framework/static/images/fugue/chevron-expand.png
similarity index 100%
rename from static/images/fugue/chevron-expand.png
rename to lib/galaxy/web/framework/static/images/fugue/chevron-expand.png
diff --git a/static/images/fugue/chevron.png b/lib/galaxy/web/framework/static/images/fugue/chevron.png
similarity index 100%
rename from static/images/fugue/chevron.png
rename to lib/galaxy/web/framework/static/images/fugue/chevron.png
diff --git a/static/images/fugue/control-270.png b/lib/galaxy/web/framework/static/images/fugue/control-270.png
similarity index 100%
rename from static/images/fugue/control-270.png
rename to lib/galaxy/web/framework/static/images/fugue/control-270.png
diff --git a/static/images/fugue/cross-button.png b/lib/galaxy/web/framework/static/images/fugue/cross-button.png
similarity index 100%
rename from static/images/fugue/cross-button.png
rename to lib/galaxy/web/framework/static/images/fugue/cross-button.png
diff --git a/static/images/fugue/cross-circle-bw.png b/lib/galaxy/web/framework/static/images/fugue/cross-circle-bw.png
similarity index 100%
rename from static/images/fugue/cross-circle-bw.png
rename to lib/galaxy/web/framework/static/images/fugue/cross-circle-bw.png
diff --git a/static/images/fugue/cross-circle.png b/lib/galaxy/web/framework/static/images/fugue/cross-circle.png
similarity index 100%
rename from static/images/fugue/cross-circle.png
rename to lib/galaxy/web/framework/static/images/fugue/cross-circle.png
diff --git a/static/images/fugue/cross-small-bw.png b/lib/galaxy/web/framework/static/images/fugue/cross-small-bw.png
similarity index 100%
rename from static/images/fugue/cross-small-bw.png
rename to lib/galaxy/web/framework/static/images/fugue/cross-small-bw.png
diff --git a/static/images/fugue/cross.png b/lib/galaxy/web/framework/static/images/fugue/cross.png
similarity index 100%
rename from static/images/fugue/cross.png
rename to lib/galaxy/web/framework/static/images/fugue/cross.png
diff --git a/static/images/fugue/disk--arrow-bw.png b/lib/galaxy/web/framework/static/images/fugue/disk--arrow-bw.png
similarity index 100%
rename from static/images/fugue/disk--arrow-bw.png
rename to lib/galaxy/web/framework/static/images/fugue/disk--arrow-bw.png
diff --git a/static/images/fugue/disk--arrow.png b/lib/galaxy/web/framework/static/images/fugue/disk--arrow.png
similarity index 100%
rename from static/images/fugue/disk--arrow.png
rename to lib/galaxy/web/framework/static/images/fugue/disk--arrow.png
diff --git a/static/images/fugue/disk.png b/lib/galaxy/web/framework/static/images/fugue/disk.png
similarity index 100%
rename from static/images/fugue/disk.png
rename to lib/galaxy/web/framework/static/images/fugue/disk.png
diff --git a/static/images/fugue/exclamation.png b/lib/galaxy/web/framework/static/images/fugue/exclamation.png
similarity index 100%
rename from static/images/fugue/exclamation.png
rename to lib/galaxy/web/framework/static/images/fugue/exclamation.png
diff --git a/static/images/fugue/external.png b/lib/galaxy/web/framework/static/images/fugue/external.png
similarity index 100%
rename from static/images/fugue/external.png
rename to lib/galaxy/web/framework/static/images/fugue/external.png
diff --git a/static/images/fugue/eye.png b/lib/galaxy/web/framework/static/images/fugue/eye.png
similarity index 100%
rename from static/images/fugue/eye.png
rename to lib/galaxy/web/framework/static/images/fugue/eye.png
diff --git a/static/images/fugue/gear-bw.png b/lib/galaxy/web/framework/static/images/fugue/gear-bw.png
similarity index 100%
rename from static/images/fugue/gear-bw.png
rename to lib/galaxy/web/framework/static/images/fugue/gear-bw.png
diff --git a/static/images/fugue/gear.png b/lib/galaxy/web/framework/static/images/fugue/gear.png
similarity index 100%
rename from static/images/fugue/gear.png
rename to lib/galaxy/web/framework/static/images/fugue/gear.png
diff --git a/static/images/fugue/globe-bw.png b/lib/galaxy/web/framework/static/images/fugue/globe-bw.png
similarity index 100%
rename from static/images/fugue/globe-bw.png
rename to lib/galaxy/web/framework/static/images/fugue/globe-bw.png
diff --git a/static/images/fugue/globe.png b/lib/galaxy/web/framework/static/images/fugue/globe.png
similarity index 100%
rename from static/images/fugue/globe.png
rename to lib/galaxy/web/framework/static/images/fugue/globe.png
diff --git a/static/images/fugue/hammer-bw.png b/lib/galaxy/web/framework/static/images/fugue/hammer-bw.png
similarity index 100%
rename from static/images/fugue/hammer-bw.png
rename to lib/galaxy/web/framework/static/images/fugue/hammer-bw.png
diff --git a/static/images/fugue/hammer.png b/lib/galaxy/web/framework/static/images/fugue/hammer.png
similarity index 100%
rename from static/images/fugue/hammer.png
rename to lib/galaxy/web/framework/static/images/fugue/hammer.png
diff --git a/static/images/fugue/information-white.png b/lib/galaxy/web/framework/static/images/fugue/information-white.png
similarity index 100%
rename from static/images/fugue/information-white.png
rename to lib/galaxy/web/framework/static/images/fugue/information-white.png
diff --git a/static/images/fugue/layer-transparent-bw.png b/lib/galaxy/web/framework/static/images/fugue/layer-transparent-bw.png
similarity index 100%
rename from static/images/fugue/layer-transparent-bw.png
rename to lib/galaxy/web/framework/static/images/fugue/layer-transparent-bw.png
diff --git a/static/images/fugue/layer-transparent.png b/lib/galaxy/web/framework/static/images/fugue/layer-transparent.png
similarity index 100%
rename from static/images/fugue/layer-transparent.png
rename to lib/galaxy/web/framework/static/images/fugue/layer-transparent.png
diff --git a/static/images/fugue/layers-stack-bw.png b/lib/galaxy/web/framework/static/images/fugue/layers-stack-bw.png
similarity index 100%
rename from static/images/fugue/layers-stack-bw.png
rename to lib/galaxy/web/framework/static/images/fugue/layers-stack-bw.png
diff --git a/static/images/fugue/layers-stack.png b/lib/galaxy/web/framework/static/images/fugue/layers-stack.png
similarity index 100%
rename from static/images/fugue/layers-stack.png
rename to lib/galaxy/web/framework/static/images/fugue/layers-stack.png
diff --git a/static/images/fugue/magnifier-left.png b/lib/galaxy/web/framework/static/images/fugue/magnifier-left.png
similarity index 100%
rename from static/images/fugue/magnifier-left.png
rename to lib/galaxy/web/framework/static/images/fugue/magnifier-left.png
diff --git a/static/images/fugue/magnifier-zoom-out.png b/lib/galaxy/web/framework/static/images/fugue/magnifier-zoom-out.png
similarity index 100%
rename from static/images/fugue/magnifier-zoom-out.png
rename to lib/galaxy/web/framework/static/images/fugue/magnifier-zoom-out.png
diff --git a/static/images/fugue/magnifier-zoom.png b/lib/galaxy/web/framework/static/images/fugue/magnifier-zoom.png
similarity index 100%
rename from static/images/fugue/magnifier-zoom.png
rename to lib/galaxy/web/framework/static/images/fugue/magnifier-zoom.png
diff --git a/static/images/fugue/navigation.png b/lib/galaxy/web/framework/static/images/fugue/navigation.png
similarity index 100%
rename from static/images/fugue/navigation.png
rename to lib/galaxy/web/framework/static/images/fugue/navigation.png
diff --git a/static/images/fugue/pencil-small.png b/lib/galaxy/web/framework/static/images/fugue/pencil-small.png
similarity index 100%
rename from static/images/fugue/pencil-small.png
rename to lib/galaxy/web/framework/static/images/fugue/pencil-small.png
diff --git a/static/images/fugue/pencil.png b/lib/galaxy/web/framework/static/images/fugue/pencil.png
similarity index 100%
rename from static/images/fugue/pencil.png
rename to lib/galaxy/web/framework/static/images/fugue/pencil.png
diff --git a/static/images/fugue/plus-button-bw.png b/lib/galaxy/web/framework/static/images/fugue/plus-button-bw.png
similarity index 100%
rename from static/images/fugue/plus-button-bw.png
rename to lib/galaxy/web/framework/static/images/fugue/plus-button-bw.png
diff --git a/static/images/fugue/plus-button.png b/lib/galaxy/web/framework/static/images/fugue/plus-button.png
similarity index 100%
rename from static/images/fugue/plus-button.png
rename to lib/galaxy/web/framework/static/images/fugue/plus-button.png
diff --git a/static/images/fugue/plus-circle.png b/lib/galaxy/web/framework/static/images/fugue/plus-circle.png
similarity index 100%
rename from static/images/fugue/plus-circle.png
rename to lib/galaxy/web/framework/static/images/fugue/plus-circle.png
diff --git a/static/images/fugue/sticky-note-text.png b/lib/galaxy/web/framework/static/images/fugue/sticky-note-text.png
similarity index 100%
rename from static/images/fugue/sticky-note-text.png
rename to lib/galaxy/web/framework/static/images/fugue/sticky-note-text.png
diff --git a/static/images/fugue/tag--plus.png b/lib/galaxy/web/framework/static/images/fugue/tag--plus.png
similarity index 100%
rename from static/images/fugue/tag--plus.png
rename to lib/galaxy/web/framework/static/images/fugue/tag--plus.png
diff --git a/static/images/fugue/tag-label.png b/lib/galaxy/web/framework/static/images/fugue/tag-label.png
similarity index 100%
rename from static/images/fugue/tag-label.png
rename to lib/galaxy/web/framework/static/images/fugue/tag-label.png
diff --git a/static/images/fugue/tags.png b/lib/galaxy/web/framework/static/images/fugue/tags.png
similarity index 100%
rename from static/images/fugue/tags.png
rename to lib/galaxy/web/framework/static/images/fugue/tags.png
diff --git a/static/images/fugue/toggle-bw.png b/lib/galaxy/web/framework/static/images/fugue/toggle-bw.png
similarity index 100%
rename from static/images/fugue/toggle-bw.png
rename to lib/galaxy/web/framework/static/images/fugue/toggle-bw.png
diff --git a/static/images/fugue/toggle-expand-bw.png b/lib/galaxy/web/framework/static/images/fugue/toggle-expand-bw.png
similarity index 100%
rename from static/images/fugue/toggle-expand-bw.png
rename to lib/galaxy/web/framework/static/images/fugue/toggle-expand-bw.png
diff --git a/static/images/fugue/toggle-expand.png b/lib/galaxy/web/framework/static/images/fugue/toggle-expand.png
similarity index 100%
rename from static/images/fugue/toggle-expand.png
rename to lib/galaxy/web/framework/static/images/fugue/toggle-expand.png
diff --git a/static/images/fugue/toggle.png b/lib/galaxy/web/framework/static/images/fugue/toggle.png
similarity index 100%
rename from static/images/fugue/toggle.png
rename to lib/galaxy/web/framework/static/images/fugue/toggle.png
diff --git a/static/images/fugue/toolbox-bw.png b/lib/galaxy/web/framework/static/images/fugue/toolbox-bw.png
similarity index 100%
rename from static/images/fugue/toolbox-bw.png
rename to lib/galaxy/web/framework/static/images/fugue/toolbox-bw.png
diff --git a/static/images/fugue/toolbox.png b/lib/galaxy/web/framework/static/images/fugue/toolbox.png
similarity index 100%
rename from static/images/fugue/toolbox.png
rename to lib/galaxy/web/framework/static/images/fugue/toolbox.png
diff --git a/static/images/fugue/ui-slider-050-bw.png b/lib/galaxy/web/framework/static/images/fugue/ui-slider-050-bw.png
similarity index 100%
rename from static/images/fugue/ui-slider-050-bw.png
rename to lib/galaxy/web/framework/static/images/fugue/ui-slider-050-bw.png
diff --git a/static/images/fugue/ui-slider-050.png b/lib/galaxy/web/framework/static/images/fugue/ui-slider-050.png
similarity index 100%
rename from static/images/fugue/ui-slider-050.png
rename to lib/galaxy/web/framework/static/images/fugue/ui-slider-050.png
diff --git a/static/images/galaxyIcon_noText.png b/lib/galaxy/web/framework/static/images/galaxyIcon_noText.png
similarity index 100%
rename from static/images/galaxyIcon_noText.png
rename to lib/galaxy/web/framework/static/images/galaxyIcon_noText.png
diff --git a/static/images/hatch-023858.png b/lib/galaxy/web/framework/static/images/hatch-023858.png
similarity index 100%
rename from static/images/hatch-023858.png
rename to lib/galaxy/web/framework/static/images/hatch-023858.png
diff --git a/static/images/hatch-fade-023858.gif b/lib/galaxy/web/framework/static/images/hatch-fade-023858.gif
similarity index 100%
rename from static/images/hatch-fade-023858.gif
rename to lib/galaxy/web/framework/static/images/hatch-fade-023858.gif
diff --git a/static/images/histogram.png b/lib/galaxy/web/framework/static/images/histogram.png
similarity index 100%
rename from static/images/histogram.png
rename to lib/galaxy/web/framework/static/images/histogram.png
diff --git a/static/images/histogram2.png b/lib/galaxy/web/framework/static/images/histogram2.png
similarity index 100%
rename from static/images/histogram2.png
rename to lib/galaxy/web/framework/static/images/histogram2.png
diff --git a/static/images/history-buttons/delete_icon.png b/lib/galaxy/web/framework/static/images/history-buttons/delete_icon.png
similarity index 100%
rename from static/images/history-buttons/delete_icon.png
rename to lib/galaxy/web/framework/static/images/history-buttons/delete_icon.png
diff --git a/static/images/history-buttons/delete_icon_dark.png b/lib/galaxy/web/framework/static/images/history-buttons/delete_icon_dark.png
similarity index 100%
rename from static/images/history-buttons/delete_icon_dark.png
rename to lib/galaxy/web/framework/static/images/history-buttons/delete_icon_dark.png
diff --git a/static/images/history-buttons/delete_icon_grey.png b/lib/galaxy/web/framework/static/images/history-buttons/delete_icon_grey.png
similarity index 100%
rename from static/images/history-buttons/delete_icon_grey.png
rename to lib/galaxy/web/framework/static/images/history-buttons/delete_icon_grey.png
diff --git a/static/images/history-buttons/eye_icon.png b/lib/galaxy/web/framework/static/images/history-buttons/eye_icon.png
similarity index 100%
rename from static/images/history-buttons/eye_icon.png
rename to lib/galaxy/web/framework/static/images/history-buttons/eye_icon.png
diff --git a/static/images/history-buttons/eye_icon_dark.png b/lib/galaxy/web/framework/static/images/history-buttons/eye_icon_dark.png
similarity index 100%
rename from static/images/history-buttons/eye_icon_dark.png
rename to lib/galaxy/web/framework/static/images/history-buttons/eye_icon_dark.png
diff --git a/static/images/history-buttons/eye_icon_grey.png b/lib/galaxy/web/framework/static/images/history-buttons/eye_icon_grey.png
similarity index 100%
rename from static/images/history-buttons/eye_icon_grey.png
rename to lib/galaxy/web/framework/static/images/history-buttons/eye_icon_grey.png
diff --git a/static/images/history-buttons/pencil_icon.png b/lib/galaxy/web/framework/static/images/history-buttons/pencil_icon.png
similarity index 100%
rename from static/images/history-buttons/pencil_icon.png
rename to lib/galaxy/web/framework/static/images/history-buttons/pencil_icon.png
diff --git a/static/images/history-buttons/pencil_icon_dark.png b/lib/galaxy/web/framework/static/images/history-buttons/pencil_icon_dark.png
similarity index 100%
rename from static/images/history-buttons/pencil_icon_dark.png
rename to lib/galaxy/web/framework/static/images/history-buttons/pencil_icon_dark.png
diff --git a/static/images/history-buttons/pencil_icon_grey.png b/lib/galaxy/web/framework/static/images/history-buttons/pencil_icon_grey.png
similarity index 100%
rename from static/images/history-buttons/pencil_icon_grey.png
rename to lib/galaxy/web/framework/static/images/history-buttons/pencil_icon_grey.png
diff --git a/static/images/history-states/data_empty.png b/lib/galaxy/web/framework/static/images/history-states/data_empty.png
similarity index 100%
rename from static/images/history-states/data_empty.png
rename to lib/galaxy/web/framework/static/images/history-states/data_empty.png
diff --git a/static/images/history-states/data_error.png b/lib/galaxy/web/framework/static/images/history-states/data_error.png
similarity index 100%
rename from static/images/history-states/data_error.png
rename to lib/galaxy/web/framework/static/images/history-states/data_error.png
diff --git a/static/images/history-states/data_ok.png b/lib/galaxy/web/framework/static/images/history-states/data_ok.png
similarity index 100%
rename from static/images/history-states/data_ok.png
rename to lib/galaxy/web/framework/static/images/history-states/data_ok.png
diff --git a/static/images/history-states/data_queued.png b/lib/galaxy/web/framework/static/images/history-states/data_queued.png
similarity index 100%
rename from static/images/history-states/data_queued.png
rename to lib/galaxy/web/framework/static/images/history-states/data_queued.png
diff --git a/static/images/history.gif b/lib/galaxy/web/framework/static/images/history.gif
similarity index 100%
rename from static/images/history.gif
rename to lib/galaxy/web/framework/static/images/history.gif
diff --git a/static/images/history_down_arrow.gif b/lib/galaxy/web/framework/static/images/history_down_arrow.gif
similarity index 100%
rename from static/images/history_down_arrow.gif
rename to lib/galaxy/web/framework/static/images/history_down_arrow.gif
diff --git a/static/images/history_up_arrow.gif b/lib/galaxy/web/framework/static/images/history_up_arrow.gif
similarity index 100%
rename from static/images/history_up_arrow.gif
rename to lib/galaxy/web/framework/static/images/history_up_arrow.gif
diff --git a/static/images/icon_error_lrg.gif b/lib/galaxy/web/framework/static/images/icon_error_lrg.gif
similarity index 100%
rename from static/images/icon_error_lrg.gif
rename to lib/galaxy/web/framework/static/images/icon_error_lrg.gif
diff --git a/static/images/icon_error_sml.gif b/lib/galaxy/web/framework/static/images/icon_error_sml.gif
similarity index 100%
rename from static/images/icon_error_sml.gif
rename to lib/galaxy/web/framework/static/images/icon_error_sml.gif
diff --git a/static/images/icon_info_lrg.gif b/lib/galaxy/web/framework/static/images/icon_info_lrg.gif
similarity index 100%
rename from static/images/icon_info_lrg.gif
rename to lib/galaxy/web/framework/static/images/icon_info_lrg.gif
diff --git a/static/images/icon_info_sml.gif b/lib/galaxy/web/framework/static/images/icon_info_sml.gif
similarity index 100%
rename from static/images/icon_info_sml.gif
rename to lib/galaxy/web/framework/static/images/icon_info_sml.gif
diff --git a/static/images/icon_success_lrg.gif b/lib/galaxy/web/framework/static/images/icon_success_lrg.gif
similarity index 100%
rename from static/images/icon_success_lrg.gif
rename to lib/galaxy/web/framework/static/images/icon_success_lrg.gif
diff --git a/static/images/icon_success_sml.gif b/lib/galaxy/web/framework/static/images/icon_success_sml.gif
similarity index 100%
rename from static/images/icon_success_sml.gif
rename to lib/galaxy/web/framework/static/images/icon_success_sml.gif
diff --git a/static/images/icon_warning_lrg.gif b/lib/galaxy/web/framework/static/images/icon_warning_lrg.gif
similarity index 100%
rename from static/images/icon_warning_lrg.gif
rename to lib/galaxy/web/framework/static/images/icon_warning_lrg.gif
diff --git a/static/images/icon_warning_sml.gif b/lib/galaxy/web/framework/static/images/icon_warning_sml.gif
similarity index 100%
rename from static/images/icon_warning_sml.gif
rename to lib/galaxy/web/framework/static/images/icon_warning_sml.gif
diff --git a/static/images/jstree/32px.png b/lib/galaxy/web/framework/static/images/jstree/32px.png
similarity index 100%
rename from static/images/jstree/32px.png
rename to lib/galaxy/web/framework/static/images/jstree/32px.png
diff --git a/static/images/jstree/40px.png b/lib/galaxy/web/framework/static/images/jstree/40px.png
similarity index 100%
rename from static/images/jstree/40px.png
rename to lib/galaxy/web/framework/static/images/jstree/40px.png
diff --git a/static/images/jstree/throbber.gif b/lib/galaxy/web/framework/static/images/jstree/throbber.gif
similarity index 100%
rename from static/images/jstree/throbber.gif
rename to lib/galaxy/web/framework/static/images/jstree/throbber.gif
diff --git a/static/images/kendall.png b/lib/galaxy/web/framework/static/images/kendall.png
similarity index 100%
rename from static/images/kendall.png
rename to lib/galaxy/web/framework/static/images/kendall.png
diff --git a/static/images/light_gray_grid.gif b/lib/galaxy/web/framework/static/images/light_gray_grid.gif
similarity index 100%
rename from static/images/light_gray_grid.gif
rename to lib/galaxy/web/framework/static/images/light_gray_grid.gif
diff --git a/static/images/loading_large_white_bg.gif b/lib/galaxy/web/framework/static/images/loading_large_white_bg.gif
similarity index 100%
rename from static/images/loading_large_white_bg.gif
rename to lib/galaxy/web/framework/static/images/loading_large_white_bg.gif
diff --git a/static/images/loading_small_white_bg.gif b/lib/galaxy/web/framework/static/images/loading_small_white_bg.gif
similarity index 100%
rename from static/images/loading_small_white_bg.gif
rename to lib/galaxy/web/framework/static/images/loading_small_white_bg.gif
diff --git a/static/images/maf_icons/interval2maf.png b/lib/galaxy/web/framework/static/images/maf_icons/interval2maf.png
similarity index 100%
rename from static/images/maf_icons/interval2maf.png
rename to lib/galaxy/web/framework/static/images/maf_icons/interval2maf.png
diff --git a/static/images/maf_icons/stitchMaf.png b/lib/galaxy/web/framework/static/images/maf_icons/stitchMaf.png
similarity index 100%
rename from static/images/maf_icons/stitchMaf.png
rename to lib/galaxy/web/framework/static/images/maf_icons/stitchMaf.png
diff --git a/static/images/mag_glass.png b/lib/galaxy/web/framework/static/images/mag_glass.png
similarity index 100%
rename from static/images/mag_glass.png
rename to lib/galaxy/web/framework/static/images/mag_glass.png
diff --git a/static/images/mutation_visualization_example.png b/lib/galaxy/web/framework/static/images/mutation_visualization_example.png
similarity index 100%
rename from static/images/mutation_visualization_example.png
rename to lib/galaxy/web/framework/static/images/mutation_visualization_example.png
diff --git a/static/images/openid-16x16.gif b/lib/galaxy/web/framework/static/images/openid-16x16.gif
similarity index 100%
rename from static/images/openid-16x16.gif
rename to lib/galaxy/web/framework/static/images/openid-16x16.gif
diff --git a/static/images/overview_arrows.png b/lib/galaxy/web/framework/static/images/overview_arrows.png
similarity index 100%
rename from static/images/overview_arrows.png
rename to lib/galaxy/web/framework/static/images/overview_arrows.png
diff --git a/static/images/pearson.png b/lib/galaxy/web/framework/static/images/pearson.png
similarity index 100%
rename from static/images/pearson.png
rename to lib/galaxy/web/framework/static/images/pearson.png
diff --git a/static/images/resizable.png b/lib/galaxy/web/framework/static/images/resizable.png
similarity index 100%
rename from static/images/resizable.png
rename to lib/galaxy/web/framework/static/images/resizable.png
diff --git a/static/images/rgWebLogo3_test.jpg b/lib/galaxy/web/framework/static/images/rgWebLogo3_test.jpg
similarity index 100%
rename from static/images/rgWebLogo3_test.jpg
rename to lib/galaxy/web/framework/static/images/rgWebLogo3_test.jpg
diff --git a/static/images/scatter.png b/lib/galaxy/web/framework/static/images/scatter.png
similarity index 100%
rename from static/images/scatter.png
rename to lib/galaxy/web/framework/static/images/scatter.png
diff --git a/static/images/scatterplot.png b/lib/galaxy/web/framework/static/images/scatterplot.png
similarity index 100%
rename from static/images/scatterplot.png
rename to lib/galaxy/web/framework/static/images/scatterplot.png
diff --git a/static/images/select2-spinner.gif b/lib/galaxy/web/framework/static/images/select2-spinner.gif
similarity index 100%
rename from static/images/select2-spinner.gif
rename to lib/galaxy/web/framework/static/images/select2-spinner.gif
diff --git a/static/images/select2.png b/lib/galaxy/web/framework/static/images/select2.png
similarity index 100%
rename from static/images/select2.png
rename to lib/galaxy/web/framework/static/images/select2.png
diff --git a/static/images/select2x2.png b/lib/galaxy/web/framework/static/images/select2x2.png
similarity index 100%
rename from static/images/select2x2.png
rename to lib/galaxy/web/framework/static/images/select2x2.png
diff --git a/static/images/silk/add.png b/lib/galaxy/web/framework/static/images/silk/add.png
similarity index 100%
rename from static/images/silk/add.png
rename to lib/galaxy/web/framework/static/images/silk/add.png
diff --git a/static/images/silk/book.png b/lib/galaxy/web/framework/static/images/silk/book.png
similarity index 100%
rename from static/images/silk/book.png
rename to lib/galaxy/web/framework/static/images/silk/book.png
diff --git a/static/images/silk/book_open.png b/lib/galaxy/web/framework/static/images/silk/book_open.png
similarity index 100%
rename from static/images/silk/book_open.png
rename to lib/galaxy/web/framework/static/images/silk/book_open.png
diff --git a/static/images/silk/chart_curve.png b/lib/galaxy/web/framework/static/images/silk/chart_curve.png
similarity index 100%
rename from static/images/silk/chart_curve.png
rename to lib/galaxy/web/framework/static/images/silk/chart_curve.png
diff --git a/static/images/silk/folder.png b/lib/galaxy/web/framework/static/images/silk/folder.png
similarity index 100%
rename from static/images/silk/folder.png
rename to lib/galaxy/web/framework/static/images/silk/folder.png
diff --git a/static/images/silk/folder_page.png b/lib/galaxy/web/framework/static/images/silk/folder_page.png
similarity index 100%
rename from static/images/silk/folder_page.png
rename to lib/galaxy/web/framework/static/images/silk/folder_page.png
diff --git a/static/images/silk/link.png b/lib/galaxy/web/framework/static/images/silk/link.png
similarity index 100%
rename from static/images/silk/link.png
rename to lib/galaxy/web/framework/static/images/silk/link.png
diff --git a/static/images/silk/link_break.png b/lib/galaxy/web/framework/static/images/silk/link_break.png
similarity index 100%
rename from static/images/silk/link_break.png
rename to lib/galaxy/web/framework/static/images/silk/link_break.png
diff --git a/static/images/silk/page_white.png b/lib/galaxy/web/framework/static/images/silk/page_white.png
similarity index 100%
rename from static/images/silk/page_white.png
rename to lib/galaxy/web/framework/static/images/silk/page_white.png
diff --git a/static/images/silk/page_white_compressed.png b/lib/galaxy/web/framework/static/images/silk/page_white_compressed.png
similarity index 100%
rename from static/images/silk/page_white_compressed.png
rename to lib/galaxy/web/framework/static/images/silk/page_white_compressed.png
diff --git a/static/images/silk/resultset_bottom.png b/lib/galaxy/web/framework/static/images/silk/resultset_bottom.png
similarity index 100%
rename from static/images/silk/resultset_bottom.png
rename to lib/galaxy/web/framework/static/images/silk/resultset_bottom.png
diff --git a/static/images/silk/resultset_next.png b/lib/galaxy/web/framework/static/images/silk/resultset_next.png
similarity index 100%
rename from static/images/silk/resultset_next.png
rename to lib/galaxy/web/framework/static/images/silk/resultset_next.png
diff --git a/static/images/silk/resultset_previous.png b/lib/galaxy/web/framework/static/images/silk/resultset_previous.png
similarity index 100%
rename from static/images/silk/resultset_previous.png
rename to lib/galaxy/web/framework/static/images/silk/resultset_previous.png
diff --git a/static/images/solid_qual.png b/lib/galaxy/web/framework/static/images/solid_qual.png
similarity index 100%
rename from static/images/solid_qual.png
rename to lib/galaxy/web/framework/static/images/solid_qual.png
diff --git a/static/images/spearman.png b/lib/galaxy/web/framework/static/images/spearman.png
similarity index 100%
rename from static/images/spearman.png
rename to lib/galaxy/web/framework/static/images/spearman.png
diff --git a/static/images/square_empty.gif b/lib/galaxy/web/framework/static/images/square_empty.gif
similarity index 100%
rename from static/images/square_empty.gif
rename to lib/galaxy/web/framework/static/images/square_empty.gif
diff --git a/static/images/square_error.gif b/lib/galaxy/web/framework/static/images/square_error.gif
similarity index 100%
rename from static/images/square_error.gif
rename to lib/galaxy/web/framework/static/images/square_error.gif
diff --git a/static/images/square_ok.gif b/lib/galaxy/web/framework/static/images/square_ok.gif
similarity index 100%
rename from static/images/square_ok.gif
rename to lib/galaxy/web/framework/static/images/square_ok.gif
diff --git a/static/images/square_queued.gif b/lib/galaxy/web/framework/static/images/square_queued.gif
similarity index 100%
rename from static/images/square_queued.gif
rename to lib/galaxy/web/framework/static/images/square_queued.gif
diff --git a/static/images/square_running.gif b/lib/galaxy/web/framework/static/images/square_running.gif
similarity index 100%
rename from static/images/square_running.gif
rename to lib/galaxy/web/framework/static/images/square_running.gif
diff --git a/static/images/star.gif b/lib/galaxy/web/framework/static/images/star.gif
similarity index 100%
rename from static/images/star.gif
rename to lib/galaxy/web/framework/static/images/star.gif
diff --git a/static/images/thumbtack_icon.png b/lib/galaxy/web/framework/static/images/thumbtack_icon.png
similarity index 100%
rename from static/images/thumbtack_icon.png
rename to lib/galaxy/web/framework/static/images/thumbtack_icon.png
diff --git a/static/images/thumbtack_icon_dark.png b/lib/galaxy/web/framework/static/images/thumbtack_icon_dark.png
similarity index 100%
rename from static/images/thumbtack_icon_dark.png
rename to lib/galaxy/web/framework/static/images/thumbtack_icon_dark.png
diff --git a/static/images/tipsy.gif b/lib/galaxy/web/framework/static/images/tipsy.gif
similarity index 100%
rename from static/images/tipsy.gif
rename to lib/galaxy/web/framework/static/images/tipsy.gif
diff --git a/static/images/tool_menu_down_arrow.gif b/lib/galaxy/web/framework/static/images/tool_menu_down_arrow.gif
similarity index 100%
rename from static/images/tool_menu_down_arrow.gif
rename to lib/galaxy/web/framework/static/images/tool_menu_down_arrow.gif
diff --git a/static/images/tools/lda/first_matrix_generator_example_file.png b/lib/galaxy/web/framework/static/images/tools/lda/first_matrix_generator_example_file.png
similarity index 100%
rename from static/images/tools/lda/first_matrix_generator_example_file.png
rename to lib/galaxy/web/framework/static/images/tools/lda/first_matrix_generator_example_file.png
diff --git a/static/images/tools/lda/second_matrix_generator_example_file.png b/lib/galaxy/web/framework/static/images/tools/lda/second_matrix_generator_example_file.png
similarity index 100%
rename from static/images/tools/lda/second_matrix_generator_example_file.png
rename to lib/galaxy/web/framework/static/images/tools/lda/second_matrix_generator_example_file.png
diff --git a/static/images/tracks/block.png b/lib/galaxy/web/framework/static/images/tracks/block.png
similarity index 100%
rename from static/images/tracks/block.png
rename to lib/galaxy/web/framework/static/images/tracks/block.png
diff --git a/static/images/tracks/close_btn.gif b/lib/galaxy/web/framework/static/images/tracks/close_btn.gif
similarity index 100%
rename from static/images/tracks/close_btn.gif
rename to lib/galaxy/web/framework/static/images/tracks/close_btn.gif
diff --git a/static/images/tracks/diag_bg.gif b/lib/galaxy/web/framework/static/images/tracks/diag_bg.gif
similarity index 100%
rename from static/images/tracks/diag_bg.gif
rename to lib/galaxy/web/framework/static/images/tracks/diag_bg.gif
diff --git a/static/images/tracks/go_btn.gif b/lib/galaxy/web/framework/static/images/tracks/go_btn.gif
similarity index 100%
rename from static/images/tracks/go_btn.gif
rename to lib/galaxy/web/framework/static/images/tracks/go_btn.gif
diff --git a/static/images/tracks/handle-left.gif b/lib/galaxy/web/framework/static/images/tracks/handle-left.gif
similarity index 100%
rename from static/images/tracks/handle-left.gif
rename to lib/galaxy/web/framework/static/images/tracks/handle-left.gif
diff --git a/static/images/tracks/handle-right.gif b/lib/galaxy/web/framework/static/images/tracks/handle-right.gif
similarity index 100%
rename from static/images/tracks/handle-right.gif
rename to lib/galaxy/web/framework/static/images/tracks/handle-right.gif
diff --git a/static/images/tracks/pan_left.gif b/lib/galaxy/web/framework/static/images/tracks/pan_left.gif
similarity index 100%
rename from static/images/tracks/pan_left.gif
rename to lib/galaxy/web/framework/static/images/tracks/pan_left.gif
diff --git a/static/images/tracks/pan_right.gif b/lib/galaxy/web/framework/static/images/tracks/pan_right.gif
similarity index 100%
rename from static/images/tracks/pan_right.gif
rename to lib/galaxy/web/framework/static/images/tracks/pan_right.gif
diff --git a/static/images/tracks/show_history.gif b/lib/galaxy/web/framework/static/images/tracks/show_history.gif
similarity index 100%
rename from static/images/tracks/show_history.gif
rename to lib/galaxy/web/framework/static/images/tracks/show_history.gif
diff --git a/static/images/tracks/zoom_in.gif b/lib/galaxy/web/framework/static/images/tracks/zoom_in.gif
similarity index 100%
rename from static/images/tracks/zoom_in.gif
rename to lib/galaxy/web/framework/static/images/tracks/zoom_in.gif
diff --git a/static/images/tracks/zoom_in_full.gif b/lib/galaxy/web/framework/static/images/tracks/zoom_in_full.gif
similarity index 100%
rename from static/images/tracks/zoom_in_full.gif
rename to lib/galaxy/web/framework/static/images/tracks/zoom_in_full.gif
diff --git a/static/images/tracks/zoom_out.gif b/lib/galaxy/web/framework/static/images/tracks/zoom_out.gif
similarity index 100%
rename from static/images/tracks/zoom_out.gif
rename to lib/galaxy/web/framework/static/images/tracks/zoom_out.gif
diff --git a/static/images/tracks/zoom_out_full.gif b/lib/galaxy/web/framework/static/images/tracks/zoom_out_full.gif
similarity index 100%
rename from static/images/tracks/zoom_out_full.gif
rename to lib/galaxy/web/framework/static/images/tracks/zoom_out_full.gif
diff --git a/static/images/up.gif b/lib/galaxy/web/framework/static/images/up.gif
similarity index 100%
rename from static/images/up.gif
rename to lib/galaxy/web/framework/static/images/up.gif
diff --git a/static/images/visualization/draggable_horizontal.png b/lib/galaxy/web/framework/static/images/visualization/draggable_horizontal.png
similarity index 100%
rename from static/images/visualization/draggable_horizontal.png
rename to lib/galaxy/web/framework/static/images/visualization/draggable_horizontal.png
diff --git a/static/images/visualization/draggable_vertical.png b/lib/galaxy/web/framework/static/images/visualization/draggable_vertical.png
similarity index 100%
rename from static/images/visualization/draggable_vertical.png
rename to lib/galaxy/web/framework/static/images/visualization/draggable_vertical.png
diff --git a/static/images/visualization/strand_left.png b/lib/galaxy/web/framework/static/images/visualization/strand_left.png
similarity index 100%
rename from static/images/visualization/strand_left.png
rename to lib/galaxy/web/framework/static/images/visualization/strand_left.png
diff --git a/static/images/visualization/strand_left_inv.png b/lib/galaxy/web/framework/static/images/visualization/strand_left_inv.png
similarity index 100%
rename from static/images/visualization/strand_left_inv.png
rename to lib/galaxy/web/framework/static/images/visualization/strand_left_inv.png
diff --git a/static/images/visualization/strand_right.png b/lib/galaxy/web/framework/static/images/visualization/strand_right.png
similarity index 100%
rename from static/images/visualization/strand_right.png
rename to lib/galaxy/web/framework/static/images/visualization/strand_right.png
diff --git a/static/images/visualization/strand_right_inv.png b/lib/galaxy/web/framework/static/images/visualization/strand_right_inv.png
similarity index 100%
rename from static/images/visualization/strand_right_inv.png
rename to lib/galaxy/web/framework/static/images/visualization/strand_right_inv.png
diff --git a/static/images/yui/rel_interstitial_loading.gif b/lib/galaxy/web/framework/static/images/yui/rel_interstitial_loading.gif
similarity index 100%
rename from static/images/yui/rel_interstitial_loading.gif
rename to lib/galaxy/web/framework/static/images/yui/rel_interstitial_loading.gif
diff --git a/lib/galaxy/web/framework/static/src b/lib/galaxy/web/framework/static/src
new file mode 120000
index 00000000000..ff897777cef
--- /dev/null
+++ b/lib/galaxy/web/framework/static/src
@@ -0,0 +1 @@
+../../../../../client/galaxy/scripts
\ No newline at end of file
diff --git a/lib/galaxy/web/framework/static/toolshed/src b/lib/galaxy/web/framework/static/toolshed/src
new file mode 120000
index 00000000000..c220e9eeebb
--- /dev/null
+++ b/lib/galaxy/web/framework/static/toolshed/src
@@ -0,0 +1 @@
+../../../../../../client/toolshed/scripts
\ No newline at end of file
diff --git a/templates/admin/dataset_security/group/grid.mako b/lib/galaxy/web/framework/templates/admin/dataset_security/group/grid.mako
similarity index 100%
rename from templates/admin/dataset_security/group/grid.mako
rename to lib/galaxy/web/framework/templates/admin/dataset_security/group/grid.mako
diff --git a/templates/admin/dataset_security/group/group.mako b/lib/galaxy/web/framework/templates/admin/dataset_security/group/group.mako
similarity index 100%
rename from templates/admin/dataset_security/group/group.mako
rename to lib/galaxy/web/framework/templates/admin/dataset_security/group/group.mako
diff --git a/templates/admin/dataset_security/group/group_create.mako b/lib/galaxy/web/framework/templates/admin/dataset_security/group/group_create.mako
similarity index 100%
rename from templates/admin/dataset_security/group/group_create.mako
rename to lib/galaxy/web/framework/templates/admin/dataset_security/group/group_create.mako
diff --git a/templates/admin/dataset_security/group/group_rename.mako b/lib/galaxy/web/framework/templates/admin/dataset_security/group/group_rename.mako
similarity index 100%
rename from templates/admin/dataset_security/group/group_rename.mako
rename to lib/galaxy/web/framework/templates/admin/dataset_security/group/group_rename.mako
diff --git a/templates/admin/dataset_security/role/grid.mako b/lib/galaxy/web/framework/templates/admin/dataset_security/role/grid.mako
similarity index 100%
rename from templates/admin/dataset_security/role/grid.mako
rename to lib/galaxy/web/framework/templates/admin/dataset_security/role/grid.mako
diff --git a/templates/admin/dataset_security/role/role.mako b/lib/galaxy/web/framework/templates/admin/dataset_security/role/role.mako
similarity index 100%
rename from templates/admin/dataset_security/role/role.mako
rename to lib/galaxy/web/framework/templates/admin/dataset_security/role/role.mako
diff --git a/templates/admin/dataset_security/role/role_create.mako b/lib/galaxy/web/framework/templates/admin/dataset_security/role/role_create.mako
similarity index 100%
rename from templates/admin/dataset_security/role/role_create.mako
rename to lib/galaxy/web/framework/templates/admin/dataset_security/role/role_create.mako
diff --git a/templates/admin/dataset_security/role/role_rename.mako b/lib/galaxy/web/framework/templates/admin/dataset_security/role/role_rename.mako
similarity index 100%
rename from templates/admin/dataset_security/role/role_rename.mako
rename to lib/galaxy/web/framework/templates/admin/dataset_security/role/role_rename.mako
diff --git a/templates/admin/external_service/common.mako b/lib/galaxy/web/framework/templates/admin/external_service/common.mako
similarity index 100%
rename from templates/admin/external_service/common.mako
rename to lib/galaxy/web/framework/templates/admin/external_service/common.mako
diff --git a/templates/admin/external_service/create_external_service.mako b/lib/galaxy/web/framework/templates/admin/external_service/create_external_service.mako
similarity index 100%
rename from templates/admin/external_service/create_external_service.mako
rename to lib/galaxy/web/framework/templates/admin/external_service/create_external_service.mako
diff --git a/templates/admin/external_service/edit_external_service.mako b/lib/galaxy/web/framework/templates/admin/external_service/edit_external_service.mako
similarity index 100%
rename from templates/admin/external_service/edit_external_service.mako
rename to lib/galaxy/web/framework/templates/admin/external_service/edit_external_service.mako
diff --git a/templates/admin/external_service/grid.mako b/lib/galaxy/web/framework/templates/admin/external_service/grid.mako
similarity index 100%
rename from templates/admin/external_service/grid.mako
rename to lib/galaxy/web/framework/templates/admin/external_service/grid.mako
diff --git a/templates/admin/external_service/reload_external_service_types.mako b/lib/galaxy/web/framework/templates/admin/external_service/reload_external_service_types.mako
similarity index 100%
rename from templates/admin/external_service/reload_external_service_types.mako
rename to lib/galaxy/web/framework/templates/admin/external_service/reload_external_service_types.mako
diff --git a/templates/admin/external_service/view_external_service.mako b/lib/galaxy/web/framework/templates/admin/external_service/view_external_service.mako
similarity index 100%
rename from templates/admin/external_service/view_external_service.mako
rename to lib/galaxy/web/framework/templates/admin/external_service/view_external_service.mako
diff --git a/templates/admin/forms/create_form.mako b/lib/galaxy/web/framework/templates/admin/forms/create_form.mako
similarity index 100%
rename from templates/admin/forms/create_form.mako
rename to lib/galaxy/web/framework/templates/admin/forms/create_form.mako
diff --git a/templates/admin/forms/edit_form_definition.mako b/lib/galaxy/web/framework/templates/admin/forms/edit_form_definition.mako
similarity index 100%
rename from templates/admin/forms/edit_form_definition.mako
rename to lib/galaxy/web/framework/templates/admin/forms/edit_form_definition.mako
diff --git a/templates/admin/forms/grid.mako b/lib/galaxy/web/framework/templates/admin/forms/grid.mako
similarity index 100%
rename from templates/admin/forms/grid.mako
rename to lib/galaxy/web/framework/templates/admin/forms/grid.mako
diff --git a/templates/admin/forms/view_form_definition.mako b/lib/galaxy/web/framework/templates/admin/forms/view_form_definition.mako
similarity index 100%
rename from templates/admin/forms/view_form_definition.mako
rename to lib/galaxy/web/framework/templates/admin/forms/view_form_definition.mako
diff --git a/templates/admin/impersonate.mako b/lib/galaxy/web/framework/templates/admin/impersonate.mako
similarity index 100%
rename from templates/admin/impersonate.mako
rename to lib/galaxy/web/framework/templates/admin/impersonate.mako
diff --git a/templates/admin/jobs.mako b/lib/galaxy/web/framework/templates/admin/jobs.mako
similarity index 100%
rename from templates/admin/jobs.mako
rename to lib/galaxy/web/framework/templates/admin/jobs.mako
diff --git a/templates/admin/library/grid.mako b/lib/galaxy/web/framework/templates/admin/library/grid.mako
similarity index 100%
rename from templates/admin/library/grid.mako
rename to lib/galaxy/web/framework/templates/admin/library/grid.mako
diff --git a/templates/admin/library/new_library.mako b/lib/galaxy/web/framework/templates/admin/library/new_library.mako
similarity index 100%
rename from templates/admin/library/new_library.mako
rename to lib/galaxy/web/framework/templates/admin/library/new_library.mako
diff --git a/templates/admin/package_tool.mako b/lib/galaxy/web/framework/templates/admin/package_tool.mako
similarity index 100%
rename from templates/admin/package_tool.mako
rename to lib/galaxy/web/framework/templates/admin/package_tool.mako
diff --git a/templates/admin/quota/grid.mako b/lib/galaxy/web/framework/templates/admin/quota/grid.mako
similarity index 100%
rename from templates/admin/quota/grid.mako
rename to lib/galaxy/web/framework/templates/admin/quota/grid.mako
diff --git a/templates/admin/quota/quota.mako b/lib/galaxy/web/framework/templates/admin/quota/quota.mako
similarity index 100%
rename from templates/admin/quota/quota.mako
rename to lib/galaxy/web/framework/templates/admin/quota/quota.mako
diff --git a/templates/admin/quota/quota_create.mako b/lib/galaxy/web/framework/templates/admin/quota/quota_create.mako
similarity index 100%
rename from templates/admin/quota/quota_create.mako
rename to lib/galaxy/web/framework/templates/admin/quota/quota_create.mako
diff --git a/templates/admin/quota/quota_edit.mako b/lib/galaxy/web/framework/templates/admin/quota/quota_edit.mako
similarity index 100%
rename from templates/admin/quota/quota_edit.mako
rename to lib/galaxy/web/framework/templates/admin/quota/quota_edit.mako
diff --git a/templates/admin/quota/quota_rename.mako b/lib/galaxy/web/framework/templates/admin/quota/quota_rename.mako
similarity index 100%
rename from templates/admin/quota/quota_rename.mako
rename to lib/galaxy/web/framework/templates/admin/quota/quota_rename.mako
diff --git a/templates/admin/quota/quota_set_default.mako b/lib/galaxy/web/framework/templates/admin/quota/quota_set_default.mako
similarity index 100%
rename from templates/admin/quota/quota_set_default.mako
rename to lib/galaxy/web/framework/templates/admin/quota/quota_set_default.mako
diff --git a/templates/admin/reload_tool.mako b/lib/galaxy/web/framework/templates/admin/reload_tool.mako
similarity index 100%
rename from templates/admin/reload_tool.mako
rename to lib/galaxy/web/framework/templates/admin/reload_tool.mako
diff --git a/templates/admin/request_type/common.mako b/lib/galaxy/web/framework/templates/admin/request_type/common.mako
similarity index 100%
rename from templates/admin/request_type/common.mako
rename to lib/galaxy/web/framework/templates/admin/request_type/common.mako
diff --git a/templates/admin/request_type/create_request_type.mako b/lib/galaxy/web/framework/templates/admin/request_type/create_request_type.mako
similarity index 100%
rename from templates/admin/request_type/create_request_type.mako
rename to lib/galaxy/web/framework/templates/admin/request_type/create_request_type.mako
diff --git a/templates/admin/request_type/edit_request_type.mako b/lib/galaxy/web/framework/templates/admin/request_type/edit_request_type.mako
similarity index 100%
rename from templates/admin/request_type/edit_request_type.mako
rename to lib/galaxy/web/framework/templates/admin/request_type/edit_request_type.mako
diff --git a/templates/admin/request_type/grid.mako b/lib/galaxy/web/framework/templates/admin/request_type/grid.mako
similarity index 100%
rename from templates/admin/request_type/grid.mako
rename to lib/galaxy/web/framework/templates/admin/request_type/grid.mako
diff --git a/templates/admin/request_type/request_type_permissions.mako b/lib/galaxy/web/framework/templates/admin/request_type/request_type_permissions.mako
similarity index 100%
rename from templates/admin/request_type/request_type_permissions.mako
rename to lib/galaxy/web/framework/templates/admin/request_type/request_type_permissions.mako
diff --git a/templates/admin/request_type/view_request_type.mako b/lib/galaxy/web/framework/templates/admin/request_type/view_request_type.mako
similarity index 100%
rename from templates/admin/request_type/view_request_type.mako
rename to lib/galaxy/web/framework/templates/admin/request_type/view_request_type.mako
diff --git a/templates/admin/requests/grid.mako b/lib/galaxy/web/framework/templates/admin/requests/grid.mako
similarity index 100%
rename from templates/admin/requests/grid.mako
rename to lib/galaxy/web/framework/templates/admin/requests/grid.mako
diff --git a/templates/admin/requests/reject.mako b/lib/galaxy/web/framework/templates/admin/requests/reject.mako
similarity index 100%
rename from templates/admin/requests/reject.mako
rename to lib/galaxy/web/framework/templates/admin/requests/reject.mako
diff --git a/templates/admin/requests/rename_datasets.mako b/lib/galaxy/web/framework/templates/admin/requests/rename_datasets.mako
similarity index 100%
rename from templates/admin/requests/rename_datasets.mako
rename to lib/galaxy/web/framework/templates/admin/requests/rename_datasets.mako
diff --git a/templates/admin/requests/sample_datasets_grid.mako b/lib/galaxy/web/framework/templates/admin/requests/sample_datasets_grid.mako
similarity index 100%
rename from templates/admin/requests/sample_datasets_grid.mako
rename to lib/galaxy/web/framework/templates/admin/requests/sample_datasets_grid.mako
diff --git a/templates/admin/requests/view_sample_dataset.mako b/lib/galaxy/web/framework/templates/admin/requests/view_sample_dataset.mako
similarity index 100%
rename from templates/admin/requests/view_sample_dataset.mako
rename to lib/galaxy/web/framework/templates/admin/requests/view_sample_dataset.mako
diff --git a/templates/admin/review_tool_migration_stages.mako b/lib/galaxy/web/framework/templates/admin/review_tool_migration_stages.mako
similarity index 100%
rename from templates/admin/review_tool_migration_stages.mako
rename to lib/galaxy/web/framework/templates/admin/review_tool_migration_stages.mako
diff --git a/templates/admin/tool_errors.mako b/lib/galaxy/web/framework/templates/admin/tool_errors.mako
similarity index 100%
rename from templates/admin/tool_errors.mako
rename to lib/galaxy/web/framework/templates/admin/tool_errors.mako
diff --git a/templates/admin/tool_shed_repository/browse_categories.mako b/lib/galaxy/web/framework/templates/admin/tool_shed_repository/browse_categories.mako
similarity index 100%
rename from templates/admin/tool_shed_repository/browse_categories.mako
rename to lib/galaxy/web/framework/templates/admin/tool_shed_repository/browse_categories.mako
diff --git a/templates/admin/tool_shed_repository/browse_category.mako b/lib/galaxy/web/framework/templates/admin/tool_shed_repository/browse_category.mako
similarity index 100%
rename from templates/admin/tool_shed_repository/browse_category.mako
rename to lib/galaxy/web/framework/templates/admin/tool_shed_repository/browse_category.mako
diff --git a/templates/admin/tool_shed_repository/browse_repository.mako b/lib/galaxy/web/framework/templates/admin/tool_shed_repository/browse_repository.mako
similarity index 100%
rename from templates/admin/tool_shed_repository/browse_repository.mako
rename to lib/galaxy/web/framework/templates/admin/tool_shed_repository/browse_repository.mako
diff --git a/templates/admin/tool_shed_repository/browse_tool_dependency.mako b/lib/galaxy/web/framework/templates/admin/tool_shed_repository/browse_tool_dependency.mako
similarity index 100%
rename from templates/admin/tool_shed_repository/browse_tool_dependency.mako
rename to lib/galaxy/web/framework/templates/admin/tool_shed_repository/browse_tool_dependency.mako
diff --git a/templates/admin/tool_shed_repository/common.mako b/lib/galaxy/web/framework/templates/admin/tool_shed_repository/common.mako
similarity index 100%
rename from templates/admin/tool_shed_repository/common.mako
rename to lib/galaxy/web/framework/templates/admin/tool_shed_repository/common.mako
diff --git a/templates/admin/tool_shed_repository/deactivate_or_uninstall_repository.mako b/lib/galaxy/web/framework/templates/admin/tool_shed_repository/deactivate_or_uninstall_repository.mako
similarity index 100%
rename from templates/admin/tool_shed_repository/deactivate_or_uninstall_repository.mako
rename to lib/galaxy/web/framework/templates/admin/tool_shed_repository/deactivate_or_uninstall_repository.mako
diff --git a/templates/admin/tool_shed_repository/grid.mako b/lib/galaxy/web/framework/templates/admin/tool_shed_repository/grid.mako
similarity index 100%
rename from templates/admin/tool_shed_repository/grid.mako
rename to lib/galaxy/web/framework/templates/admin/tool_shed_repository/grid.mako
diff --git a/templates/admin/tool_shed_repository/initiate_repository_installation.mako b/lib/galaxy/web/framework/templates/admin/tool_shed_repository/initiate_repository_installation.mako
similarity index 100%
rename from templates/admin/tool_shed_repository/initiate_repository_installation.mako
rename to lib/galaxy/web/framework/templates/admin/tool_shed_repository/initiate_repository_installation.mako
diff --git a/templates/admin/tool_shed_repository/install_tool_dependencies_with_update.mako b/lib/galaxy/web/framework/templates/admin/tool_shed_repository/install_tool_dependencies_with_update.mako
similarity index 100%
rename from templates/admin/tool_shed_repository/install_tool_dependencies_with_update.mako
rename to lib/galaxy/web/framework/templates/admin/tool_shed_repository/install_tool_dependencies_with_update.mako
diff --git a/templates/admin/tool_shed_repository/manage_repository.mako b/lib/galaxy/web/framework/templates/admin/tool_shed_repository/manage_repository.mako
similarity index 100%
rename from templates/admin/tool_shed_repository/manage_repository.mako
rename to lib/galaxy/web/framework/templates/admin/tool_shed_repository/manage_repository.mako
diff --git a/templates/admin/tool_shed_repository/manage_repository_tool_dependencies.mako b/lib/galaxy/web/framework/templates/admin/tool_shed_repository/manage_repository_tool_dependencies.mako
similarity index 100%
rename from templates/admin/tool_shed_repository/manage_repository_tool_dependencies.mako
rename to lib/galaxy/web/framework/templates/admin/tool_shed_repository/manage_repository_tool_dependencies.mako
diff --git a/templates/admin/tool_shed_repository/preview_repository.mako b/lib/galaxy/web/framework/templates/admin/tool_shed_repository/preview_repository.mako
similarity index 100%
rename from templates/admin/tool_shed_repository/preview_repository.mako
rename to lib/galaxy/web/framework/templates/admin/tool_shed_repository/preview_repository.mako
diff --git a/templates/admin/tool_shed_repository/purge_repository_confirmation.mako b/lib/galaxy/web/framework/templates/admin/tool_shed_repository/purge_repository_confirmation.mako
similarity index 100%
rename from templates/admin/tool_shed_repository/purge_repository_confirmation.mako
rename to lib/galaxy/web/framework/templates/admin/tool_shed_repository/purge_repository_confirmation.mako
diff --git a/templates/admin/tool_shed_repository/repair_repository.mako b/lib/galaxy/web/framework/templates/admin/tool_shed_repository/repair_repository.mako
similarity index 100%
rename from templates/admin/tool_shed_repository/repair_repository.mako
rename to lib/galaxy/web/framework/templates/admin/tool_shed_repository/repair_repository.mako
diff --git a/templates/admin/tool_shed_repository/repository_actions_menu.mako b/lib/galaxy/web/framework/templates/admin/tool_shed_repository/repository_actions_menu.mako
similarity index 100%
rename from templates/admin/tool_shed_repository/repository_actions_menu.mako
rename to lib/galaxy/web/framework/templates/admin/tool_shed_repository/repository_actions_menu.mako
diff --git a/templates/admin/tool_shed_repository/repository_installation_grid.mako b/lib/galaxy/web/framework/templates/admin/tool_shed_repository/repository_installation_grid.mako
similarity index 100%
rename from templates/admin/tool_shed_repository/repository_installation_grid.mako
rename to lib/galaxy/web/framework/templates/admin/tool_shed_repository/repository_installation_grid.mako
diff --git a/templates/admin/tool_shed_repository/repository_installation_status.mako b/lib/galaxy/web/framework/templates/admin/tool_shed_repository/repository_installation_status.mako
similarity index 100%
rename from templates/admin/tool_shed_repository/repository_installation_status.mako
rename to lib/galaxy/web/framework/templates/admin/tool_shed_repository/repository_installation_status.mako
diff --git a/templates/admin/tool_shed_repository/reselect_tool_panel_section.mako b/lib/galaxy/web/framework/templates/admin/tool_shed_repository/reselect_tool_panel_section.mako
similarity index 100%
rename from templates/admin/tool_shed_repository/reselect_tool_panel_section.mako
rename to lib/galaxy/web/framework/templates/admin/tool_shed_repository/reselect_tool_panel_section.mako
diff --git a/templates/admin/tool_shed_repository/reset_metadata_on_selected_repositories.mako b/lib/galaxy/web/framework/templates/admin/tool_shed_repository/reset_metadata_on_selected_repositories.mako
similarity index 100%
rename from templates/admin/tool_shed_repository/reset_metadata_on_selected_repositories.mako
rename to lib/galaxy/web/framework/templates/admin/tool_shed_repository/reset_metadata_on_selected_repositories.mako
diff --git a/templates/admin/tool_shed_repository/select_shed_tool_panel_config.mako b/lib/galaxy/web/framework/templates/admin/tool_shed_repository/select_shed_tool_panel_config.mako
similarity index 100%
rename from templates/admin/tool_shed_repository/select_shed_tool_panel_config.mako
rename to lib/galaxy/web/framework/templates/admin/tool_shed_repository/select_shed_tool_panel_config.mako
diff --git a/templates/admin/tool_shed_repository/select_tool_panel_section.mako b/lib/galaxy/web/framework/templates/admin/tool_shed_repository/select_tool_panel_section.mako
similarity index 100%
rename from templates/admin/tool_shed_repository/select_tool_panel_section.mako
rename to lib/galaxy/web/framework/templates/admin/tool_shed_repository/select_tool_panel_section.mako
diff --git a/templates/admin/tool_shed_repository/tool_dependencies_grid.mako b/lib/galaxy/web/framework/templates/admin/tool_shed_repository/tool_dependencies_grid.mako
similarity index 100%
rename from templates/admin/tool_shed_repository/tool_dependencies_grid.mako
rename to lib/galaxy/web/framework/templates/admin/tool_shed_repository/tool_dependencies_grid.mako
diff --git a/templates/admin/tool_shed_repository/tool_dependency_installation_status.mako b/lib/galaxy/web/framework/templates/admin/tool_shed_repository/tool_dependency_installation_status.mako
similarity index 100%
rename from templates/admin/tool_shed_repository/tool_dependency_installation_status.mako
rename to lib/galaxy/web/framework/templates/admin/tool_shed_repository/tool_dependency_installation_status.mako
diff --git a/templates/admin/tool_shed_repository/uninstall_tool_dependencies.mako b/lib/galaxy/web/framework/templates/admin/tool_shed_repository/uninstall_tool_dependencies.mako
similarity index 100%
rename from templates/admin/tool_shed_repository/uninstall_tool_dependencies.mako
rename to lib/galaxy/web/framework/templates/admin/tool_shed_repository/uninstall_tool_dependencies.mako
diff --git a/templates/admin/tool_shed_repository/view_tool_metadata.mako b/lib/galaxy/web/framework/templates/admin/tool_shed_repository/view_tool_metadata.mako
similarity index 100%
rename from templates/admin/tool_shed_repository/view_tool_metadata.mako
rename to lib/galaxy/web/framework/templates/admin/tool_shed_repository/view_tool_metadata.mako
diff --git a/templates/admin/tool_shed_repository/view_workflow.mako b/lib/galaxy/web/framework/templates/admin/tool_shed_repository/view_workflow.mako
similarity index 100%
rename from templates/admin/tool_shed_repository/view_workflow.mako
rename to lib/galaxy/web/framework/templates/admin/tool_shed_repository/view_workflow.mako
diff --git a/templates/admin/tool_version/grid.mako b/lib/galaxy/web/framework/templates/admin/tool_version/grid.mako
similarity index 100%
rename from templates/admin/tool_version/grid.mako
rename to lib/galaxy/web/framework/templates/admin/tool_version/grid.mako
diff --git a/templates/admin/user/grid.mako b/lib/galaxy/web/framework/templates/admin/user/grid.mako
similarity index 100%
rename from templates/admin/user/grid.mako
rename to lib/galaxy/web/framework/templates/admin/user/grid.mako
diff --git a/templates/admin/user/reset_password.mako b/lib/galaxy/web/framework/templates/admin/user/reset_password.mako
similarity index 100%
rename from templates/admin/user/reset_password.mako
rename to lib/galaxy/web/framework/templates/admin/user/reset_password.mako
diff --git a/templates/admin/user/user.mako b/lib/galaxy/web/framework/templates/admin/user/user.mako
similarity index 100%
rename from templates/admin/user/user.mako
rename to lib/galaxy/web/framework/templates/admin/user/user.mako
diff --git a/templates/admin/view_data_tables_registry.mako b/lib/galaxy/web/framework/templates/admin/view_data_tables_registry.mako
similarity index 100%
rename from templates/admin/view_data_tables_registry.mako
rename to lib/galaxy/web/framework/templates/admin/view_data_tables_registry.mako
diff --git a/templates/admin/view_datatypes_registry.mako b/lib/galaxy/web/framework/templates/admin/view_datatypes_registry.mako
similarity index 100%
rename from templates/admin/view_datatypes_registry.mako
rename to lib/galaxy/web/framework/templates/admin/view_datatypes_registry.mako
diff --git a/templates/base.mako b/lib/galaxy/web/framework/templates/base.mako
similarity index 100%
rename from templates/base.mako
rename to lib/galaxy/web/framework/templates/base.mako
diff --git a/templates/base/base_panels.mako b/lib/galaxy/web/framework/templates/base/base_panels.mako
similarity index 100%
rename from templates/base/base_panels.mako
rename to lib/galaxy/web/framework/templates/base/base_panels.mako
diff --git a/templates/common/select_template.mako b/lib/galaxy/web/framework/templates/common/select_template.mako
similarity index 100%
rename from templates/common/select_template.mako
rename to lib/galaxy/web/framework/templates/common/select_template.mako
diff --git a/templates/common/template_common.mako b/lib/galaxy/web/framework/templates/common/template_common.mako
similarity index 100%
rename from templates/common/template_common.mako
rename to lib/galaxy/web/framework/templates/common/template_common.mako
diff --git a/templates/display_base.mako b/lib/galaxy/web/framework/templates/display_base.mako
similarity index 100%
rename from templates/display_base.mako
rename to lib/galaxy/web/framework/templates/display_base.mako
diff --git a/templates/display_common.mako b/lib/galaxy/web/framework/templates/display_common.mako
similarity index 100%
rename from templates/display_common.mako
rename to lib/galaxy/web/framework/templates/display_common.mako
diff --git a/templates/embed_base.mako b/lib/galaxy/web/framework/templates/embed_base.mako
similarity index 100%
rename from templates/embed_base.mako
rename to lib/galaxy/web/framework/templates/embed_base.mako
diff --git a/templates/export_base.mako b/lib/galaxy/web/framework/templates/export_base.mako
similarity index 100%
rename from templates/export_base.mako
rename to lib/galaxy/web/framework/templates/export_base.mako
diff --git a/templates/form.mako b/lib/galaxy/web/framework/templates/form.mako
similarity index 100%
rename from templates/form.mako
rename to lib/galaxy/web/framework/templates/form.mako
diff --git a/templates/galaxy_client_app.mako b/lib/galaxy/web/framework/templates/galaxy_client_app.mako
similarity index 100%
rename from templates/galaxy_client_app.mako
rename to lib/galaxy/web/framework/templates/galaxy_client_app.mako
diff --git a/templates/grid_base.mako b/lib/galaxy/web/framework/templates/grid_base.mako
similarity index 100%
rename from templates/grid_base.mako
rename to lib/galaxy/web/framework/templates/grid_base.mako
diff --git a/templates/grid_base_async.mako b/lib/galaxy/web/framework/templates/grid_base_async.mako
similarity index 100%
rename from templates/grid_base_async.mako
rename to lib/galaxy/web/framework/templates/grid_base_async.mako
diff --git a/templates/ind_share_base.mako b/lib/galaxy/web/framework/templates/ind_share_base.mako
similarity index 100%
rename from templates/ind_share_base.mako
rename to lib/galaxy/web/framework/templates/ind_share_base.mako
diff --git a/templates/js-app.mako b/lib/galaxy/web/framework/templates/js-app.mako
similarity index 100%
rename from templates/js-app.mako
rename to lib/galaxy/web/framework/templates/js-app.mako
diff --git a/templates/message.mako b/lib/galaxy/web/framework/templates/message.mako
similarity index 100%
rename from templates/message.mako
rename to lib/galaxy/web/framework/templates/message.mako
diff --git a/templates/no_access.mako b/lib/galaxy/web/framework/templates/no_access.mako
similarity index 100%
rename from templates/no_access.mako
rename to lib/galaxy/web/framework/templates/no_access.mako
diff --git a/templates/page_base.mako b/lib/galaxy/web/framework/templates/page_base.mako
similarity index 100%
rename from templates/page_base.mako
rename to lib/galaxy/web/framework/templates/page_base.mako
diff --git a/templates/panels.mako b/lib/galaxy/web/framework/templates/panels.mako
similarity index 100%
rename from templates/panels.mako
rename to lib/galaxy/web/framework/templates/panels.mako
diff --git a/templates/refresh_frames.mako b/lib/galaxy/web/framework/templates/refresh_frames.mako
similarity index 100%
rename from templates/refresh_frames.mako
rename to lib/galaxy/web/framework/templates/refresh_frames.mako
diff --git a/templates/rss.mako b/lib/galaxy/web/framework/templates/rss.mako
similarity index 100%
rename from templates/rss.mako
rename to lib/galaxy/web/framework/templates/rss.mako
diff --git a/templates/search/index.mako b/lib/galaxy/web/framework/templates/search/index.mako
similarity index 100%
rename from templates/search/index.mako
rename to lib/galaxy/web/framework/templates/search/index.mako
diff --git a/templates/sharing_base.mako b/lib/galaxy/web/framework/templates/sharing_base.mako
similarity index 100%
rename from templates/sharing_base.mako
rename to lib/galaxy/web/framework/templates/sharing_base.mako
diff --git a/templates/show_params.mako b/lib/galaxy/web/framework/templates/show_params.mako
similarity index 100%
rename from templates/show_params.mako
rename to lib/galaxy/web/framework/templates/show_params.mako
diff --git a/templates/slug_editing_js.mako b/lib/galaxy/web/framework/templates/slug_editing_js.mako
similarity index 100%
rename from templates/slug_editing_js.mako
rename to lib/galaxy/web/framework/templates/slug_editing_js.mako
diff --git a/templates/sorting_base.mako b/lib/galaxy/web/framework/templates/sorting_base.mako
similarity index 100%
rename from templates/sorting_base.mako
rename to lib/galaxy/web/framework/templates/sorting_base.mako
diff --git a/templates/spark_base.mako b/lib/galaxy/web/framework/templates/spark_base.mako
similarity index 100%
rename from templates/spark_base.mako
rename to lib/galaxy/web/framework/templates/spark_base.mako
diff --git a/templates/tagging_common.mako b/lib/galaxy/web/framework/templates/tagging_common.mako
similarity index 100%
rename from templates/tagging_common.mako
rename to lib/galaxy/web/framework/templates/tagging_common.mako
diff --git a/templates/tool_shed_rating.mako b/lib/galaxy/web/framework/templates/tool_shed_rating.mako
similarity index 100%
rename from templates/tool_shed_rating.mako
rename to lib/galaxy/web/framework/templates/tool_shed_rating.mako
diff --git a/templates/user/change_password.mako b/lib/galaxy/web/framework/templates/user/change_password.mako
similarity index 100%
rename from templates/user/change_password.mako
rename to lib/galaxy/web/framework/templates/user/change_password.mako
diff --git a/templates/user/dbkeys.mako b/lib/galaxy/web/framework/templates/user/dbkeys.mako
similarity index 100%
rename from templates/user/dbkeys.mako
rename to lib/galaxy/web/framework/templates/user/dbkeys.mako
diff --git a/templates/user/edit_address.mako b/lib/galaxy/web/framework/templates/user/edit_address.mako
similarity index 100%
rename from templates/user/edit_address.mako
rename to lib/galaxy/web/framework/templates/user/edit_address.mako
diff --git a/templates/user/index.mako b/lib/galaxy/web/framework/templates/user/index.mako
similarity index 100%
rename from templates/user/index.mako
rename to lib/galaxy/web/framework/templates/user/index.mako
diff --git a/templates/user/info.mako b/lib/galaxy/web/framework/templates/user/info.mako
similarity index 100%
rename from templates/user/info.mako
rename to lib/galaxy/web/framework/templates/user/info.mako
diff --git a/templates/user/login.mako b/lib/galaxy/web/framework/templates/user/login.mako
similarity index 100%
rename from templates/user/login.mako
rename to lib/galaxy/web/framework/templates/user/login.mako
diff --git a/templates/user/logout.mako b/lib/galaxy/web/framework/templates/user/logout.mako
similarity index 100%
rename from templates/user/logout.mako
rename to lib/galaxy/web/framework/templates/user/logout.mako
diff --git a/templates/user/new_address.mako b/lib/galaxy/web/framework/templates/user/new_address.mako
similarity index 100%
rename from templates/user/new_address.mako
rename to lib/galaxy/web/framework/templates/user/new_address.mako
diff --git a/templates/user/openid_associate.mako b/lib/galaxy/web/framework/templates/user/openid_associate.mako
similarity index 100%
rename from templates/user/openid_associate.mako
rename to lib/galaxy/web/framework/templates/user/openid_associate.mako
diff --git a/templates/user/openid_manage.mako b/lib/galaxy/web/framework/templates/user/openid_manage.mako
similarity index 100%
rename from templates/user/openid_manage.mako
rename to lib/galaxy/web/framework/templates/user/openid_manage.mako
diff --git a/templates/user/permissions.mako b/lib/galaxy/web/framework/templates/user/permissions.mako
similarity index 100%
rename from templates/user/permissions.mako
rename to lib/galaxy/web/framework/templates/user/permissions.mako
diff --git a/templates/user/register.mako b/lib/galaxy/web/framework/templates/user/register.mako
similarity index 100%
rename from templates/user/register.mako
rename to lib/galaxy/web/framework/templates/user/register.mako
diff --git a/templates/user/reset_password.mako b/lib/galaxy/web/framework/templates/user/reset_password.mako
similarity index 100%
rename from templates/user/reset_password.mako
rename to lib/galaxy/web/framework/templates/user/reset_password.mako
diff --git a/templates/user/toolbox_filters.mako b/lib/galaxy/web/framework/templates/user/toolbox_filters.mako
similarity index 100%
rename from templates/user/toolbox_filters.mako
rename to lib/galaxy/web/framework/templates/user/toolbox_filters.mako
diff --git a/templates/user/username.mako b/lib/galaxy/web/framework/templates/user/username.mako
similarity index 100%
rename from templates/user/username.mako
rename to lib/galaxy/web/framework/templates/user/username.mako
diff --git a/templates/webapps/galaxy/admin/center.mako b/lib/galaxy/web/framework/templates/webapps/galaxy/admin/center.mako
similarity index 100%
rename from templates/webapps/galaxy/admin/center.mako
rename to lib/galaxy/web/framework/templates/webapps/galaxy/admin/center.mako
diff --git a/templates/webapps/galaxy/admin/index.mako b/lib/galaxy/web/framework/templates/webapps/galaxy/admin/index.mako
similarity index 100%
rename from templates/webapps/galaxy/admin/index.mako
rename to lib/galaxy/web/framework/templates/webapps/galaxy/admin/index.mako
diff --git a/templates/webapps/galaxy/admin/sanitize_whitelist.mako b/lib/galaxy/web/framework/templates/webapps/galaxy/admin/sanitize_whitelist.mako
similarity index 100%
rename from templates/webapps/galaxy/admin/sanitize_whitelist.mako
rename to lib/galaxy/web/framework/templates/webapps/galaxy/admin/sanitize_whitelist.mako
diff --git a/templates/webapps/galaxy/admin/tool_sheds.mako b/lib/galaxy/web/framework/templates/webapps/galaxy/admin/tool_sheds.mako
similarity index 100%
rename from templates/webapps/galaxy/admin/tool_sheds.mako
rename to lib/galaxy/web/framework/templates/webapps/galaxy/admin/tool_sheds.mako
diff --git a/templates/webapps/galaxy/admin/toolsheds.mako b/lib/galaxy/web/framework/templates/webapps/galaxy/admin/toolsheds.mako
similarity index 100%
rename from templates/webapps/galaxy/admin/toolsheds.mako
rename to lib/galaxy/web/framework/templates/webapps/galaxy/admin/toolsheds.mako
diff --git a/templates/webapps/galaxy/admin/view_display_applications.mako b/lib/galaxy/web/framework/templates/webapps/galaxy/admin/view_display_applications.mako
similarity index 100%
rename from templates/webapps/galaxy/admin/view_display_applications.mako
rename to lib/galaxy/web/framework/templates/webapps/galaxy/admin/view_display_applications.mako
diff --git a/templates/webapps/galaxy/base_panels.mako b/lib/galaxy/web/framework/templates/webapps/galaxy/base_panels.mako
similarity index 100%
rename from templates/webapps/galaxy/base_panels.mako
rename to lib/galaxy/web/framework/templates/webapps/galaxy/base_panels.mako
diff --git a/templates/webapps/galaxy/biostar/post_redirect.mako b/lib/galaxy/web/framework/templates/webapps/galaxy/biostar/post_redirect.mako
similarity index 100%
rename from templates/webapps/galaxy/biostar/post_redirect.mako
rename to lib/galaxy/web/framework/templates/webapps/galaxy/biostar/post_redirect.mako
diff --git a/templates/webapps/galaxy/data_manager/index.mako b/lib/galaxy/web/framework/templates/webapps/galaxy/data_manager/index.mako
similarity index 100%
rename from templates/webapps/galaxy/data_manager/index.mako
rename to lib/galaxy/web/framework/templates/webapps/galaxy/data_manager/index.mako
diff --git a/templates/webapps/galaxy/data_manager/manage_data_manager.mako b/lib/galaxy/web/framework/templates/webapps/galaxy/data_manager/manage_data_manager.mako
similarity index 100%
rename from templates/webapps/galaxy/data_manager/manage_data_manager.mako
rename to lib/galaxy/web/framework/templates/webapps/galaxy/data_manager/manage_data_manager.mako
diff --git a/templates/webapps/galaxy/data_manager/manage_data_table.mako b/lib/galaxy/web/framework/templates/webapps/galaxy/data_manager/manage_data_table.mako
similarity index 100%
rename from templates/webapps/galaxy/data_manager/manage_data_table.mako
rename to lib/galaxy/web/framework/templates/webapps/galaxy/data_manager/manage_data_table.mako
diff --git a/templates/webapps/galaxy/data_manager/view_job.mako b/lib/galaxy/web/framework/templates/webapps/galaxy/data_manager/view_job.mako
similarity index 100%
rename from templates/webapps/galaxy/data_manager/view_job.mako
rename to lib/galaxy/web/framework/templates/webapps/galaxy/data_manager/view_job.mako
diff --git a/templates/webapps/galaxy/dataset/copy_view.mako b/lib/galaxy/web/framework/templates/webapps/galaxy/dataset/copy_view.mako
similarity index 100%
rename from templates/webapps/galaxy/dataset/copy_view.mako
rename to lib/galaxy/web/framework/templates/webapps/galaxy/dataset/copy_view.mako
diff --git a/templates/webapps/galaxy/dataset/display.mako b/lib/galaxy/web/framework/templates/webapps/galaxy/dataset/display.mako
similarity index 100%
rename from templates/webapps/galaxy/dataset/display.mako
rename to lib/galaxy/web/framework/templates/webapps/galaxy/dataset/display.mako
diff --git a/templates/webapps/galaxy/dataset/display_application/display.mako b/lib/galaxy/web/framework/templates/webapps/galaxy/dataset/display_application/display.mako
similarity index 100%
rename from templates/webapps/galaxy/dataset/display_application/display.mako
rename to lib/galaxy/web/framework/templates/webapps/galaxy/dataset/display_application/display.mako
diff --git a/templates/webapps/galaxy/dataset/edit_attributes.mako b/lib/galaxy/web/framework/templates/webapps/galaxy/dataset/edit_attributes.mako
similarity index 100%
rename from templates/webapps/galaxy/dataset/edit_attributes.mako
rename to lib/galaxy/web/framework/templates/webapps/galaxy/dataset/edit_attributes.mako
diff --git a/templates/webapps/galaxy/dataset/embed.mako b/lib/galaxy/web/framework/templates/webapps/galaxy/dataset/embed.mako
similarity index 100%
rename from templates/webapps/galaxy/dataset/embed.mako
rename to lib/galaxy/web/framework/templates/webapps/galaxy/dataset/embed.mako
diff --git a/templates/webapps/galaxy/dataset/errors.mako b/lib/galaxy/web/framework/templates/webapps/galaxy/dataset/errors.mako
similarity index 100%
rename from templates/webapps/galaxy/dataset/errors.mako
rename to lib/galaxy/web/framework/templates/webapps/galaxy/dataset/errors.mako
diff --git a/templates/webapps/galaxy/dataset/grid.mako b/lib/galaxy/web/framework/templates/webapps/galaxy/dataset/grid.mako
similarity index 100%
rename from templates/webapps/galaxy/dataset/grid.mako
rename to lib/galaxy/web/framework/templates/webapps/galaxy/dataset/grid.mako
diff --git a/templates/webapps/galaxy/dataset/item_content.mako b/lib/galaxy/web/framework/templates/webapps/galaxy/dataset/item_content.mako
similarity index 100%
rename from templates/webapps/galaxy/dataset/item_content.mako
rename to lib/galaxy/web/framework/templates/webapps/galaxy/dataset/item_content.mako
diff --git a/templates/webapps/galaxy/dataset/large_file.mako b/lib/galaxy/web/framework/templates/webapps/galaxy/dataset/large_file.mako
similarity index 100%
rename from templates/webapps/galaxy/dataset/large_file.mako
rename to lib/galaxy/web/framework/templates/webapps/galaxy/dataset/large_file.mako
diff --git a/templates/webapps/galaxy/dataset/security_common.mako b/lib/galaxy/web/framework/templates/webapps/galaxy/dataset/security_common.mako
similarity index 100%
rename from templates/webapps/galaxy/dataset/security_common.mako
rename to lib/galaxy/web/framework/templates/webapps/galaxy/dataset/security_common.mako
diff --git a/templates/webapps/galaxy/dataset/tabular_chunked.mako b/lib/galaxy/web/framework/templates/webapps/galaxy/dataset/tabular_chunked.mako
similarity index 100%
rename from templates/webapps/galaxy/dataset/tabular_chunked.mako
rename to lib/galaxy/web/framework/templates/webapps/galaxy/dataset/tabular_chunked.mako
diff --git a/templates/webapps/galaxy/external_services/generic_jquery_grid.mako b/lib/galaxy/web/framework/templates/webapps/galaxy/external_services/generic_jquery_grid.mako
similarity index 100%
rename from templates/webapps/galaxy/external_services/generic_jquery_grid.mako
rename to lib/galaxy/web/framework/templates/webapps/galaxy/external_services/generic_jquery_grid.mako
diff --git a/templates/webapps/galaxy/external_services/generic_json.mako b/lib/galaxy/web/framework/templates/webapps/galaxy/external_services/generic_json.mako
similarity index 100%
rename from templates/webapps/galaxy/external_services/generic_json.mako
rename to lib/galaxy/web/framework/templates/webapps/galaxy/external_services/generic_json.mako
diff --git a/templates/webapps/galaxy/external_services/json_common.mako b/lib/galaxy/web/framework/templates/webapps/galaxy/external_services/json_common.mako
similarity index 100%
rename from templates/webapps/galaxy/external_services/json_common.mako
rename to lib/galaxy/web/framework/templates/webapps/galaxy/external_services/json_common.mako
diff --git a/templates/webapps/galaxy/galaxy.masthead.mako b/lib/galaxy/web/framework/templates/webapps/galaxy/galaxy.masthead.mako
similarity index 100%
rename from templates/webapps/galaxy/galaxy.masthead.mako
rename to lib/galaxy/web/framework/templates/webapps/galaxy/galaxy.masthead.mako
diff --git a/templates/webapps/galaxy/galaxy.panels.mako b/lib/galaxy/web/framework/templates/webapps/galaxy/galaxy.panels.mako
similarity index 100%
rename from templates/webapps/galaxy/galaxy.panels.mako
rename to lib/galaxy/web/framework/templates/webapps/galaxy/galaxy.panels.mako
diff --git a/templates/webapps/galaxy/history/as_xml.mako b/lib/galaxy/web/framework/templates/webapps/galaxy/history/as_xml.mako
similarity index 100%
rename from templates/webapps/galaxy/history/as_xml.mako
rename to lib/galaxy/web/framework/templates/webapps/galaxy/history/as_xml.mako
diff --git a/templates/webapps/galaxy/history/citations.mako b/lib/galaxy/web/framework/templates/webapps/galaxy/history/citations.mako
similarity index 100%
rename from templates/webapps/galaxy/history/citations.mako
rename to lib/galaxy/web/framework/templates/webapps/galaxy/history/citations.mako
diff --git a/templates/webapps/galaxy/history/display.mako b/lib/galaxy/web/framework/templates/webapps/galaxy/history/display.mako
similarity index 100%
rename from templates/webapps/galaxy/history/display.mako
rename to lib/galaxy/web/framework/templates/webapps/galaxy/history/display.mako
diff --git a/templates/webapps/galaxy/history/display_structured.mako b/lib/galaxy/web/framework/templates/webapps/galaxy/history/display_structured.mako
similarity index 100%
rename from templates/webapps/galaxy/history/display_structured.mako
rename to lib/galaxy/web/framework/templates/webapps/galaxy/history/display_structured.mako
diff --git a/templates/webapps/galaxy/history/embed.mako b/lib/galaxy/web/framework/templates/webapps/galaxy/history/embed.mako
similarity index 100%
rename from templates/webapps/galaxy/history/embed.mako
rename to lib/galaxy/web/framework/templates/webapps/galaxy/history/embed.mako
diff --git a/templates/webapps/galaxy/history/grid.mako b/lib/galaxy/web/framework/templates/webapps/galaxy/history/grid.mako
similarity index 100%
rename from templates/webapps/galaxy/history/grid.mako
rename to lib/galaxy/web/framework/templates/webapps/galaxy/history/grid.mako
diff --git a/templates/webapps/galaxy/history/grid_js.mako b/lib/galaxy/web/framework/templates/webapps/galaxy/history/grid_js.mako
similarity index 100%
rename from templates/webapps/galaxy/history/grid_js.mako
rename to lib/galaxy/web/framework/templates/webapps/galaxy/history/grid_js.mako
diff --git a/templates/webapps/galaxy/history/item_content.mako b/lib/galaxy/web/framework/templates/webapps/galaxy/history/item_content.mako
similarity index 100%
rename from templates/webapps/galaxy/history/item_content.mako
rename to lib/galaxy/web/framework/templates/webapps/galaxy/history/item_content.mako
diff --git a/templates/webapps/galaxy/history/list_as_xml.mako b/lib/galaxy/web/framework/templates/webapps/galaxy/history/list_as_xml.mako
similarity index 100%
rename from templates/webapps/galaxy/history/list_as_xml.mako
rename to lib/galaxy/web/framework/templates/webapps/galaxy/history/list_as_xml.mako
diff --git a/templates/webapps/galaxy/history/list_published.mako b/lib/galaxy/web/framework/templates/webapps/galaxy/history/list_published.mako
similarity index 100%
rename from templates/webapps/galaxy/history/list_published.mako
rename to lib/galaxy/web/framework/templates/webapps/galaxy/history/list_published.mako
diff --git a/templates/webapps/galaxy/history/permissions.mako b/lib/galaxy/web/framework/templates/webapps/galaxy/history/permissions.mako
similarity index 100%
rename from templates/webapps/galaxy/history/permissions.mako
rename to lib/galaxy/web/framework/templates/webapps/galaxy/history/permissions.mako
diff --git a/templates/webapps/galaxy/history/rename.mako b/lib/galaxy/web/framework/templates/webapps/galaxy/history/rename.mako
similarity index 100%
rename from templates/webapps/galaxy/history/rename.mako
rename to lib/galaxy/web/framework/templates/webapps/galaxy/history/rename.mako
diff --git a/templates/webapps/galaxy/history/share.mako b/lib/galaxy/web/framework/templates/webapps/galaxy/history/share.mako
similarity index 100%
rename from templates/webapps/galaxy/history/share.mako
rename to lib/galaxy/web/framework/templates/webapps/galaxy/history/share.mako
diff --git a/templates/webapps/galaxy/history/shared_grid.mako b/lib/galaxy/web/framework/templates/webapps/galaxy/history/shared_grid.mako
similarity index 100%
rename from templates/webapps/galaxy/history/shared_grid.mako
rename to lib/galaxy/web/framework/templates/webapps/galaxy/history/shared_grid.mako
diff --git a/templates/webapps/galaxy/history/structure.mako b/lib/galaxy/web/framework/templates/webapps/galaxy/history/structure.mako
similarity index 100%
rename from templates/webapps/galaxy/history/structure.mako
rename to lib/galaxy/web/framework/templates/webapps/galaxy/history/structure.mako
diff --git a/templates/webapps/galaxy/history/view.mako b/lib/galaxy/web/framework/templates/webapps/galaxy/history/view.mako
similarity index 100%
rename from templates/webapps/galaxy/history/view.mako
rename to lib/galaxy/web/framework/templates/webapps/galaxy/history/view.mako
diff --git a/templates/webapps/galaxy/history/view_multiple.mako b/lib/galaxy/web/framework/templates/webapps/galaxy/history/view_multiple.mako
similarity index 100%
rename from templates/webapps/galaxy/history/view_multiple.mako
rename to lib/galaxy/web/framework/templates/webapps/galaxy/history/view_multiple.mako
diff --git a/templates/webapps/galaxy/library/common/browse_library.mako b/lib/galaxy/web/framework/templates/webapps/galaxy/library/common/browse_library.mako
similarity index 100%
rename from templates/webapps/galaxy/library/common/browse_library.mako
rename to lib/galaxy/web/framework/templates/webapps/galaxy/library/common/browse_library.mako
diff --git a/templates/webapps/galaxy/library/common/browse_library_opt.mako b/lib/galaxy/web/framework/templates/webapps/galaxy/library/common/browse_library_opt.mako
similarity index 100%
rename from templates/webapps/galaxy/library/common/browse_library_opt.mako
rename to lib/galaxy/web/framework/templates/webapps/galaxy/library/common/browse_library_opt.mako
diff --git a/templates/webapps/galaxy/library/common/common.mako b/lib/galaxy/web/framework/templates/webapps/galaxy/library/common/common.mako
similarity index 100%
rename from templates/webapps/galaxy/library/common/common.mako
rename to lib/galaxy/web/framework/templates/webapps/galaxy/library/common/common.mako
diff --git a/templates/webapps/galaxy/library/common/folder_info.mako b/lib/galaxy/web/framework/templates/webapps/galaxy/library/common/folder_info.mako
similarity index 100%
rename from templates/webapps/galaxy/library/common/folder_info.mako
rename to lib/galaxy/web/framework/templates/webapps/galaxy/library/common/folder_info.mako
diff --git a/templates/webapps/galaxy/library/common/folder_permissions.mako b/lib/galaxy/web/framework/templates/webapps/galaxy/library/common/folder_permissions.mako
similarity index 100%
rename from templates/webapps/galaxy/library/common/folder_permissions.mako
rename to lib/galaxy/web/framework/templates/webapps/galaxy/library/common/folder_permissions.mako
diff --git a/templates/webapps/galaxy/library/common/import_datasets_to_histories.mako b/lib/galaxy/web/framework/templates/webapps/galaxy/library/common/import_datasets_to_histories.mako
similarity index 100%
rename from templates/webapps/galaxy/library/common/import_datasets_to_histories.mako
rename to lib/galaxy/web/framework/templates/webapps/galaxy/library/common/import_datasets_to_histories.mako
diff --git a/templates/webapps/galaxy/library/common/ldda_edit_info.mako b/lib/galaxy/web/framework/templates/webapps/galaxy/library/common/ldda_edit_info.mako
similarity index 100%
rename from templates/webapps/galaxy/library/common/ldda_edit_info.mako
rename to lib/galaxy/web/framework/templates/webapps/galaxy/library/common/ldda_edit_info.mako
diff --git a/templates/webapps/galaxy/library/common/ldda_info.mako b/lib/galaxy/web/framework/templates/webapps/galaxy/library/common/ldda_info.mako
similarity index 100%
rename from templates/webapps/galaxy/library/common/ldda_info.mako
rename to lib/galaxy/web/framework/templates/webapps/galaxy/library/common/ldda_info.mako
diff --git a/templates/webapps/galaxy/library/common/ldda_permissions.mako b/lib/galaxy/web/framework/templates/webapps/galaxy/library/common/ldda_permissions.mako
similarity index 100%
rename from templates/webapps/galaxy/library/common/ldda_permissions.mako
rename to lib/galaxy/web/framework/templates/webapps/galaxy/library/common/ldda_permissions.mako
diff --git a/templates/webapps/galaxy/library/common/library_dataset_info.mako b/lib/galaxy/web/framework/templates/webapps/galaxy/library/common/library_dataset_info.mako
similarity index 100%
rename from templates/webapps/galaxy/library/common/library_dataset_info.mako
rename to lib/galaxy/web/framework/templates/webapps/galaxy/library/common/library_dataset_info.mako
diff --git a/templates/webapps/galaxy/library/common/library_dataset_permissions.mako b/lib/galaxy/web/framework/templates/webapps/galaxy/library/common/library_dataset_permissions.mako
similarity index 100%
rename from templates/webapps/galaxy/library/common/library_dataset_permissions.mako
rename to lib/galaxy/web/framework/templates/webapps/galaxy/library/common/library_dataset_permissions.mako
diff --git a/templates/webapps/galaxy/library/common/library_dataset_search_results.mako b/lib/galaxy/web/framework/templates/webapps/galaxy/library/common/library_dataset_search_results.mako
similarity index 100%
rename from templates/webapps/galaxy/library/common/library_dataset_search_results.mako
rename to lib/galaxy/web/framework/templates/webapps/galaxy/library/common/library_dataset_search_results.mako
diff --git a/templates/webapps/galaxy/library/common/library_info.mako b/lib/galaxy/web/framework/templates/webapps/galaxy/library/common/library_info.mako
similarity index 100%
rename from templates/webapps/galaxy/library/common/library_info.mako
rename to lib/galaxy/web/framework/templates/webapps/galaxy/library/common/library_info.mako
diff --git a/templates/webapps/galaxy/library/common/library_item_info.mako b/lib/galaxy/web/framework/templates/webapps/galaxy/library/common/library_item_info.mako
similarity index 100%
rename from templates/webapps/galaxy/library/common/library_item_info.mako
rename to lib/galaxy/web/framework/templates/webapps/galaxy/library/common/library_item_info.mako
diff --git a/templates/webapps/galaxy/library/common/library_permissions.mako b/lib/galaxy/web/framework/templates/webapps/galaxy/library/common/library_permissions.mako
similarity index 100%
rename from templates/webapps/galaxy/library/common/library_permissions.mako
rename to lib/galaxy/web/framework/templates/webapps/galaxy/library/common/library_permissions.mako
diff --git a/templates/webapps/galaxy/library/common/move_library_item.mako b/lib/galaxy/web/framework/templates/webapps/galaxy/library/common/move_library_item.mako
similarity index 100%
rename from templates/webapps/galaxy/library/common/move_library_item.mako
rename to lib/galaxy/web/framework/templates/webapps/galaxy/library/common/move_library_item.mako
diff --git a/templates/webapps/galaxy/library/common/new_folder.mako b/lib/galaxy/web/framework/templates/webapps/galaxy/library/common/new_folder.mako
similarity index 100%
rename from templates/webapps/galaxy/library/common/new_folder.mako
rename to lib/galaxy/web/framework/templates/webapps/galaxy/library/common/new_folder.mako
diff --git a/templates/webapps/galaxy/library/common/upload.mako b/lib/galaxy/web/framework/templates/webapps/galaxy/library/common/upload.mako
similarity index 100%
rename from templates/webapps/galaxy/library/common/upload.mako
rename to lib/galaxy/web/framework/templates/webapps/galaxy/library/common/upload.mako
diff --git a/templates/webapps/galaxy/library/grid.mako b/lib/galaxy/web/framework/templates/webapps/galaxy/library/grid.mako
similarity index 100%
rename from templates/webapps/galaxy/library/grid.mako
rename to lib/galaxy/web/framework/templates/webapps/galaxy/library/grid.mako
diff --git a/templates/webapps/galaxy/library/index.mako b/lib/galaxy/web/framework/templates/webapps/galaxy/library/index.mako
similarity index 100%
rename from templates/webapps/galaxy/library/index.mako
rename to lib/galaxy/web/framework/templates/webapps/galaxy/library/index.mako
diff --git a/templates/webapps/galaxy/mobile/dataset/detail.mako b/lib/galaxy/web/framework/templates/webapps/galaxy/mobile/dataset/detail.mako
similarity index 100%
rename from templates/webapps/galaxy/mobile/dataset/detail.mako
rename to lib/galaxy/web/framework/templates/webapps/galaxy/mobile/dataset/detail.mako
diff --git a/templates/webapps/galaxy/mobile/dataset/peek.mako b/lib/galaxy/web/framework/templates/webapps/galaxy/mobile/dataset/peek.mako
similarity index 100%
rename from templates/webapps/galaxy/mobile/dataset/peek.mako
rename to lib/galaxy/web/framework/templates/webapps/galaxy/mobile/dataset/peek.mako
diff --git a/templates/webapps/galaxy/mobile/form.mako b/lib/galaxy/web/framework/templates/webapps/galaxy/mobile/form.mako
similarity index 100%
rename from templates/webapps/galaxy/mobile/form.mako
rename to lib/galaxy/web/framework/templates/webapps/galaxy/mobile/form.mako
diff --git a/templates/webapps/galaxy/mobile/history/detail.mako b/lib/galaxy/web/framework/templates/webapps/galaxy/mobile/history/detail.mako
similarity index 100%
rename from templates/webapps/galaxy/mobile/history/detail.mako
rename to lib/galaxy/web/framework/templates/webapps/galaxy/mobile/history/detail.mako
diff --git a/templates/webapps/galaxy/mobile/history/list.mako b/lib/galaxy/web/framework/templates/webapps/galaxy/mobile/history/list.mako
similarity index 100%
rename from templates/webapps/galaxy/mobile/history/list.mako
rename to lib/galaxy/web/framework/templates/webapps/galaxy/mobile/history/list.mako
diff --git a/templates/webapps/galaxy/mobile/index.mako b/lib/galaxy/web/framework/templates/webapps/galaxy/mobile/index.mako
similarity index 100%
rename from templates/webapps/galaxy/mobile/index.mako
rename to lib/galaxy/web/framework/templates/webapps/galaxy/mobile/index.mako
diff --git a/templates/webapps/galaxy/mobile/manage_library.mako b/lib/galaxy/web/framework/templates/webapps/galaxy/mobile/manage_library.mako
similarity index 100%
rename from templates/webapps/galaxy/mobile/manage_library.mako
rename to lib/galaxy/web/framework/templates/webapps/galaxy/mobile/manage_library.mako
diff --git a/templates/webapps/galaxy/mobile/settings.mako b/lib/galaxy/web/framework/templates/webapps/galaxy/mobile/settings.mako
similarity index 100%
rename from templates/webapps/galaxy/mobile/settings.mako
rename to lib/galaxy/web/framework/templates/webapps/galaxy/mobile/settings.mako
diff --git a/templates/webapps/galaxy/page/create.mako b/lib/galaxy/web/framework/templates/webapps/galaxy/page/create.mako
similarity index 100%
rename from templates/webapps/galaxy/page/create.mako
rename to lib/galaxy/web/framework/templates/webapps/galaxy/page/create.mako
diff --git a/templates/webapps/galaxy/page/display.mako b/lib/galaxy/web/framework/templates/webapps/galaxy/page/display.mako
similarity index 100%
rename from templates/webapps/galaxy/page/display.mako
rename to lib/galaxy/web/framework/templates/webapps/galaxy/page/display.mako
diff --git a/templates/webapps/galaxy/page/editor.mako b/lib/galaxy/web/framework/templates/webapps/galaxy/page/editor.mako
similarity index 100%
rename from templates/webapps/galaxy/page/editor.mako
rename to lib/galaxy/web/framework/templates/webapps/galaxy/page/editor.mako
diff --git a/templates/webapps/galaxy/page/index.mako b/lib/galaxy/web/framework/templates/webapps/galaxy/page/index.mako
similarity index 100%
rename from templates/webapps/galaxy/page/index.mako
rename to lib/galaxy/web/framework/templates/webapps/galaxy/page/index.mako
diff --git a/templates/webapps/galaxy/page/list_published.mako b/lib/galaxy/web/framework/templates/webapps/galaxy/page/list_published.mako
similarity index 100%
rename from templates/webapps/galaxy/page/list_published.mako
rename to lib/galaxy/web/framework/templates/webapps/galaxy/page/list_published.mako
diff --git a/templates/webapps/galaxy/page/select_items_grid.mako b/lib/galaxy/web/framework/templates/webapps/galaxy/page/select_items_grid.mako
similarity index 100%
rename from templates/webapps/galaxy/page/select_items_grid.mako
rename to lib/galaxy/web/framework/templates/webapps/galaxy/page/select_items_grid.mako
diff --git a/templates/webapps/galaxy/page/wymiframe.mako b/lib/galaxy/web/framework/templates/webapps/galaxy/page/wymiframe.mako
similarity index 100%
rename from templates/webapps/galaxy/page/wymiframe.mako
rename to lib/galaxy/web/framework/templates/webapps/galaxy/page/wymiframe.mako
diff --git a/templates/webapps/galaxy/requests/common/add_samples.mako b/lib/galaxy/web/framework/templates/webapps/galaxy/requests/common/add_samples.mako
similarity index 100%
rename from templates/webapps/galaxy/requests/common/add_samples.mako
rename to lib/galaxy/web/framework/templates/webapps/galaxy/requests/common/add_samples.mako
diff --git a/templates/webapps/galaxy/requests/common/common.mako b/lib/galaxy/web/framework/templates/webapps/galaxy/requests/common/common.mako
similarity index 100%
rename from templates/webapps/galaxy/requests/common/common.mako
rename to lib/galaxy/web/framework/templates/webapps/galaxy/requests/common/common.mako
diff --git a/templates/webapps/galaxy/requests/common/create_request.mako b/lib/galaxy/web/framework/templates/webapps/galaxy/requests/common/create_request.mako
similarity index 100%
rename from templates/webapps/galaxy/requests/common/create_request.mako
rename to lib/galaxy/web/framework/templates/webapps/galaxy/requests/common/create_request.mako
diff --git a/templates/webapps/galaxy/requests/common/edit_basic_request_info.mako b/lib/galaxy/web/framework/templates/webapps/galaxy/requests/common/edit_basic_request_info.mako
similarity index 100%
rename from templates/webapps/galaxy/requests/common/edit_basic_request_info.mako
rename to lib/galaxy/web/framework/templates/webapps/galaxy/requests/common/edit_basic_request_info.mako
diff --git a/templates/webapps/galaxy/requests/common/edit_samples.mako b/lib/galaxy/web/framework/templates/webapps/galaxy/requests/common/edit_samples.mako
similarity index 100%
rename from templates/webapps/galaxy/requests/common/edit_samples.mako
rename to lib/galaxy/web/framework/templates/webapps/galaxy/requests/common/edit_samples.mako
diff --git a/templates/webapps/galaxy/requests/common/find_samples.mako b/lib/galaxy/web/framework/templates/webapps/galaxy/requests/common/find_samples.mako
similarity index 100%
rename from templates/webapps/galaxy/requests/common/find_samples.mako
rename to lib/galaxy/web/framework/templates/webapps/galaxy/requests/common/find_samples.mako
diff --git a/templates/webapps/galaxy/requests/common/index.mako b/lib/galaxy/web/framework/templates/webapps/galaxy/requests/common/index.mako
similarity index 100%
rename from templates/webapps/galaxy/requests/common/index.mako
rename to lib/galaxy/web/framework/templates/webapps/galaxy/requests/common/index.mako
diff --git a/templates/webapps/galaxy/requests/common/sample_dataset_transfer_status.mako b/lib/galaxy/web/framework/templates/webapps/galaxy/requests/common/sample_dataset_transfer_status.mako
similarity index 100%
rename from templates/webapps/galaxy/requests/common/sample_dataset_transfer_status.mako
rename to lib/galaxy/web/framework/templates/webapps/galaxy/requests/common/sample_dataset_transfer_status.mako
diff --git a/templates/webapps/galaxy/requests/common/sample_datasets.mako b/lib/galaxy/web/framework/templates/webapps/galaxy/requests/common/sample_datasets.mako
similarity index 100%
rename from templates/webapps/galaxy/requests/common/sample_datasets.mako
rename to lib/galaxy/web/framework/templates/webapps/galaxy/requests/common/sample_datasets.mako
diff --git a/templates/webapps/galaxy/requests/common/sample_state.mako b/lib/galaxy/web/framework/templates/webapps/galaxy/requests/common/sample_state.mako
similarity index 100%
rename from templates/webapps/galaxy/requests/common/sample_state.mako
rename to lib/galaxy/web/framework/templates/webapps/galaxy/requests/common/sample_state.mako
diff --git a/templates/webapps/galaxy/requests/common/view_request.mako b/lib/galaxy/web/framework/templates/webapps/galaxy/requests/common/view_request.mako
similarity index 100%
rename from templates/webapps/galaxy/requests/common/view_request.mako
rename to lib/galaxy/web/framework/templates/webapps/galaxy/requests/common/view_request.mako
diff --git a/templates/webapps/galaxy/requests/common/view_request_history.mako b/lib/galaxy/web/framework/templates/webapps/galaxy/requests/common/view_request_history.mako
similarity index 100%
rename from templates/webapps/galaxy/requests/common/view_request_history.mako
rename to lib/galaxy/web/framework/templates/webapps/galaxy/requests/common/view_request_history.mako
diff --git a/templates/webapps/galaxy/requests/common/view_sample.mako b/lib/galaxy/web/framework/templates/webapps/galaxy/requests/common/view_sample.mako
similarity index 100%
rename from templates/webapps/galaxy/requests/common/view_sample.mako
rename to lib/galaxy/web/framework/templates/webapps/galaxy/requests/common/view_sample.mako
diff --git a/templates/webapps/galaxy/requests/common/view_sample_datasets.mako b/lib/galaxy/web/framework/templates/webapps/galaxy/requests/common/view_sample_datasets.mako
similarity index 100%
rename from templates/webapps/galaxy/requests/common/view_sample_datasets.mako
rename to lib/galaxy/web/framework/templates/webapps/galaxy/requests/common/view_sample_datasets.mako
diff --git a/templates/webapps/galaxy/requests/common/view_sample_history.mako b/lib/galaxy/web/framework/templates/webapps/galaxy/requests/common/view_sample_history.mako
similarity index 100%
rename from templates/webapps/galaxy/requests/common/view_sample_history.mako
rename to lib/galaxy/web/framework/templates/webapps/galaxy/requests/common/view_sample_history.mako
diff --git a/templates/webapps/galaxy/requests/find_samples_index.mako b/lib/galaxy/web/framework/templates/webapps/galaxy/requests/find_samples_index.mako
similarity index 100%
rename from templates/webapps/galaxy/requests/find_samples_index.mako
rename to lib/galaxy/web/framework/templates/webapps/galaxy/requests/find_samples_index.mako
diff --git a/templates/webapps/galaxy/requests/grid.mako b/lib/galaxy/web/framework/templates/webapps/galaxy/requests/grid.mako
similarity index 100%
rename from templates/webapps/galaxy/requests/grid.mako
rename to lib/galaxy/web/framework/templates/webapps/galaxy/requests/grid.mako
diff --git a/templates/webapps/galaxy/requests/index.mako b/lib/galaxy/web/framework/templates/webapps/galaxy/requests/index.mako
similarity index 100%
rename from templates/webapps/galaxy/requests/index.mako
rename to lib/galaxy/web/framework/templates/webapps/galaxy/requests/index.mako
diff --git a/templates/webapps/galaxy/root/redirect.mako b/lib/galaxy/web/framework/templates/webapps/galaxy/root/redirect.mako
similarity index 100%
rename from templates/webapps/galaxy/root/redirect.mako
rename to lib/galaxy/web/framework/templates/webapps/galaxy/root/redirect.mako
diff --git a/templates/webapps/galaxy/root/tool_runner.mako b/lib/galaxy/web/framework/templates/webapps/galaxy/root/tool_runner.mako
similarity index 100%
rename from templates/webapps/galaxy/root/tool_runner.mako
rename to lib/galaxy/web/framework/templates/webapps/galaxy/root/tool_runner.mako
diff --git a/templates/webapps/galaxy/tracks/add_to_viz.mako b/lib/galaxy/web/framework/templates/webapps/galaxy/tracks/add_to_viz.mako
similarity index 100%
rename from templates/webapps/galaxy/tracks/add_to_viz.mako
rename to lib/galaxy/web/framework/templates/webapps/galaxy/tracks/add_to_viz.mako
diff --git a/templates/webapps/galaxy/tracks/add_tracks.mako b/lib/galaxy/web/framework/templates/webapps/galaxy/tracks/add_tracks.mako
similarity index 100%
rename from templates/webapps/galaxy/tracks/add_tracks.mako
rename to lib/galaxy/web/framework/templates/webapps/galaxy/tracks/add_tracks.mako
diff --git a/templates/webapps/galaxy/tracks/history_datasets_select_grid.mako b/lib/galaxy/web/framework/templates/webapps/galaxy/tracks/history_datasets_select_grid.mako
similarity index 100%
rename from templates/webapps/galaxy/tracks/history_datasets_select_grid.mako
rename to lib/galaxy/web/framework/templates/webapps/galaxy/tracks/history_datasets_select_grid.mako
diff --git a/templates/webapps/galaxy/tracks/history_select_grid.mako b/lib/galaxy/web/framework/templates/webapps/galaxy/tracks/history_select_grid.mako
similarity index 100%
rename from templates/webapps/galaxy/tracks/history_select_grid.mako
rename to lib/galaxy/web/framework/templates/webapps/galaxy/tracks/history_select_grid.mako
diff --git a/templates/webapps/galaxy/tracks/library_datasets_select_grid.mako b/lib/galaxy/web/framework/templates/webapps/galaxy/tracks/library_datasets_select_grid.mako
similarity index 100%
rename from templates/webapps/galaxy/tracks/library_datasets_select_grid.mako
rename to lib/galaxy/web/framework/templates/webapps/galaxy/tracks/library_datasets_select_grid.mako
diff --git a/templates/webapps/galaxy/user/api_keys.mako b/lib/galaxy/web/framework/templates/webapps/galaxy/user/api_keys.mako
similarity index 100%
rename from templates/webapps/galaxy/user/api_keys.mako
rename to lib/galaxy/web/framework/templates/webapps/galaxy/user/api_keys.mako
diff --git a/templates/webapps/galaxy/user/list_users.mako b/lib/galaxy/web/framework/templates/webapps/galaxy/user/list_users.mako
similarity index 100%
rename from templates/webapps/galaxy/user/list_users.mako
rename to lib/galaxy/web/framework/templates/webapps/galaxy/user/list_users.mako
diff --git a/templates/webapps/galaxy/user/manage_info.mako b/lib/galaxy/web/framework/templates/webapps/galaxy/user/manage_info.mako
similarity index 100%
rename from templates/webapps/galaxy/user/manage_info.mako
rename to lib/galaxy/web/framework/templates/webapps/galaxy/user/manage_info.mako
diff --git a/templates/webapps/galaxy/visualization/create.mako b/lib/galaxy/web/framework/templates/webapps/galaxy/visualization/create.mako
similarity index 100%
rename from templates/webapps/galaxy/visualization/create.mako
rename to lib/galaxy/web/framework/templates/webapps/galaxy/visualization/create.mako
diff --git a/templates/webapps/galaxy/visualization/display.mako b/lib/galaxy/web/framework/templates/webapps/galaxy/visualization/display.mako
similarity index 100%
rename from templates/webapps/galaxy/visualization/display.mako
rename to lib/galaxy/web/framework/templates/webapps/galaxy/visualization/display.mako
diff --git a/templates/webapps/galaxy/visualization/display_in_frame.mako b/lib/galaxy/web/framework/templates/webapps/galaxy/visualization/display_in_frame.mako
similarity index 100%
rename from templates/webapps/galaxy/visualization/display_in_frame.mako
rename to lib/galaxy/web/framework/templates/webapps/galaxy/visualization/display_in_frame.mako
diff --git a/templates/webapps/galaxy/visualization/embed.mako b/lib/galaxy/web/framework/templates/webapps/galaxy/visualization/embed.mako
similarity index 100%
rename from templates/webapps/galaxy/visualization/embed.mako
rename to lib/galaxy/web/framework/templates/webapps/galaxy/visualization/embed.mako
diff --git a/templates/webapps/galaxy/visualization/embed_in_frame.mako b/lib/galaxy/web/framework/templates/webapps/galaxy/visualization/embed_in_frame.mako
similarity index 100%
rename from templates/webapps/galaxy/visualization/embed_in_frame.mako
rename to lib/galaxy/web/framework/templates/webapps/galaxy/visualization/embed_in_frame.mako
diff --git a/templates/webapps/galaxy/visualization/gie.mako b/lib/galaxy/web/framework/templates/webapps/galaxy/visualization/gie.mako
similarity index 100%
rename from templates/webapps/galaxy/visualization/gie.mako
rename to lib/galaxy/web/framework/templates/webapps/galaxy/visualization/gie.mako
diff --git a/templates/webapps/galaxy/visualization/item_content.mako b/lib/galaxy/web/framework/templates/webapps/galaxy/visualization/item_content.mako
similarity index 100%
rename from templates/webapps/galaxy/visualization/item_content.mako
rename to lib/galaxy/web/framework/templates/webapps/galaxy/visualization/item_content.mako
diff --git a/templates/webapps/galaxy/visualization/list.mako b/lib/galaxy/web/framework/templates/webapps/galaxy/visualization/list.mako
similarity index 100%
rename from templates/webapps/galaxy/visualization/list.mako
rename to lib/galaxy/web/framework/templates/webapps/galaxy/visualization/list.mako
diff --git a/templates/webapps/galaxy/visualization/list_published.mako b/lib/galaxy/web/framework/templates/webapps/galaxy/visualization/list_published.mako
similarity index 100%
rename from templates/webapps/galaxy/visualization/list_published.mako
rename to lib/galaxy/web/framework/templates/webapps/galaxy/visualization/list_published.mako
diff --git a/templates/webapps/galaxy/visualization/phyloviz.mako b/lib/galaxy/web/framework/templates/webapps/galaxy/visualization/phyloviz.mako
similarity index 100%
rename from templates/webapps/galaxy/visualization/phyloviz.mako
rename to lib/galaxy/web/framework/templates/webapps/galaxy/visualization/phyloviz.mako
diff --git a/templates/webapps/galaxy/visualization/sweepster.mako b/lib/galaxy/web/framework/templates/webapps/galaxy/visualization/sweepster.mako
similarity index 100%
rename from templates/webapps/galaxy/visualization/sweepster.mako
rename to lib/galaxy/web/framework/templates/webapps/galaxy/visualization/sweepster.mako
diff --git a/templates/webapps/galaxy/workflow/build_from_current_history.mako b/lib/galaxy/web/framework/templates/webapps/galaxy/workflow/build_from_current_history.mako
similarity index 100%
rename from templates/webapps/galaxy/workflow/build_from_current_history.mako
rename to lib/galaxy/web/framework/templates/webapps/galaxy/workflow/build_from_current_history.mako
diff --git a/templates/webapps/galaxy/workflow/configure_menu.mako b/lib/galaxy/web/framework/templates/webapps/galaxy/workflow/configure_menu.mako
similarity index 100%
rename from templates/webapps/galaxy/workflow/configure_menu.mako
rename to lib/galaxy/web/framework/templates/webapps/galaxy/workflow/configure_menu.mako
diff --git a/templates/webapps/galaxy/workflow/display.mako b/lib/galaxy/web/framework/templates/webapps/galaxy/workflow/display.mako
similarity index 100%
rename from templates/webapps/galaxy/workflow/display.mako
rename to lib/galaxy/web/framework/templates/webapps/galaxy/workflow/display.mako
diff --git a/templates/webapps/galaxy/workflow/editor.mako b/lib/galaxy/web/framework/templates/webapps/galaxy/workflow/editor.mako
similarity index 100%
rename from templates/webapps/galaxy/workflow/editor.mako
rename to lib/galaxy/web/framework/templates/webapps/galaxy/workflow/editor.mako
diff --git a/templates/webapps/galaxy/workflow/editor_generic_form.mako b/lib/galaxy/web/framework/templates/webapps/galaxy/workflow/editor_generic_form.mako
similarity index 100%
rename from templates/webapps/galaxy/workflow/editor_generic_form.mako
rename to lib/galaxy/web/framework/templates/webapps/galaxy/workflow/editor_generic_form.mako
diff --git a/templates/webapps/galaxy/workflow/editor_tool_form.mako b/lib/galaxy/web/framework/templates/webapps/galaxy/workflow/editor_tool_form.mako
similarity index 100%
rename from templates/webapps/galaxy/workflow/editor_tool_form.mako
rename to lib/galaxy/web/framework/templates/webapps/galaxy/workflow/editor_tool_form.mako
diff --git a/templates/webapps/galaxy/workflow/embed.mako b/lib/galaxy/web/framework/templates/webapps/galaxy/workflow/embed.mako
similarity index 100%
rename from templates/webapps/galaxy/workflow/embed.mako
rename to lib/galaxy/web/framework/templates/webapps/galaxy/workflow/embed.mako
diff --git a/templates/webapps/galaxy/workflow/import.mako b/lib/galaxy/web/framework/templates/webapps/galaxy/workflow/import.mako
similarity index 100%
rename from templates/webapps/galaxy/workflow/import.mako
rename to lib/galaxy/web/framework/templates/webapps/galaxy/workflow/import.mako
diff --git a/templates/webapps/galaxy/workflow/index.mako b/lib/galaxy/web/framework/templates/webapps/galaxy/workflow/index.mako
similarity index 100%
rename from templates/webapps/galaxy/workflow/index.mako
rename to lib/galaxy/web/framework/templates/webapps/galaxy/workflow/index.mako
diff --git a/templates/webapps/galaxy/workflow/item_content.mako b/lib/galaxy/web/framework/templates/webapps/galaxy/workflow/item_content.mako
similarity index 100%
rename from templates/webapps/galaxy/workflow/item_content.mako
rename to lib/galaxy/web/framework/templates/webapps/galaxy/workflow/item_content.mako
diff --git a/templates/webapps/galaxy/workflow/list.mako b/lib/galaxy/web/framework/templates/webapps/galaxy/workflow/list.mako
similarity index 100%
rename from templates/webapps/galaxy/workflow/list.mako
rename to lib/galaxy/web/framework/templates/webapps/galaxy/workflow/list.mako
diff --git a/templates/webapps/galaxy/workflow/list_for_run.mako b/lib/galaxy/web/framework/templates/webapps/galaxy/workflow/list_for_run.mako
similarity index 100%
rename from templates/webapps/galaxy/workflow/list_for_run.mako
rename to lib/galaxy/web/framework/templates/webapps/galaxy/workflow/list_for_run.mako
diff --git a/templates/webapps/galaxy/workflow/list_published.mako b/lib/galaxy/web/framework/templates/webapps/galaxy/workflow/list_published.mako
similarity index 100%
rename from templates/webapps/galaxy/workflow/list_published.mako
rename to lib/galaxy/web/framework/templates/webapps/galaxy/workflow/list_published.mako
diff --git a/templates/webapps/galaxy/workflow/missing_tools.mako b/lib/galaxy/web/framework/templates/webapps/galaxy/workflow/missing_tools.mako
similarity index 100%
rename from templates/webapps/galaxy/workflow/missing_tools.mako
rename to lib/galaxy/web/framework/templates/webapps/galaxy/workflow/missing_tools.mako
diff --git a/templates/webapps/galaxy/workflow/myexp_export.mako b/lib/galaxy/web/framework/templates/webapps/galaxy/workflow/myexp_export.mako
similarity index 100%
rename from templates/webapps/galaxy/workflow/myexp_export.mako
rename to lib/galaxy/web/framework/templates/webapps/galaxy/workflow/myexp_export.mako
diff --git a/templates/webapps/galaxy/workflow/myexp_export_content.mako b/lib/galaxy/web/framework/templates/webapps/galaxy/workflow/myexp_export_content.mako
similarity index 100%
rename from templates/webapps/galaxy/workflow/myexp_export_content.mako
rename to lib/galaxy/web/framework/templates/webapps/galaxy/workflow/myexp_export_content.mako
diff --git a/templates/webapps/galaxy/workflow/rename.mako b/lib/galaxy/web/framework/templates/webapps/galaxy/workflow/rename.mako
similarity index 100%
rename from templates/webapps/galaxy/workflow/rename.mako
rename to lib/galaxy/web/framework/templates/webapps/galaxy/workflow/rename.mako
diff --git a/templates/webapps/galaxy/workflow/run.mako b/lib/galaxy/web/framework/templates/webapps/galaxy/workflow/run.mako
similarity index 100%
rename from templates/webapps/galaxy/workflow/run.mako
rename to lib/galaxy/web/framework/templates/webapps/galaxy/workflow/run.mako
diff --git a/templates/webapps/galaxy/workflow/run_complete.mako b/lib/galaxy/web/framework/templates/webapps/galaxy/workflow/run_complete.mako
similarity index 100%
rename from templates/webapps/galaxy/workflow/run_complete.mako
rename to lib/galaxy/web/framework/templates/webapps/galaxy/workflow/run_complete.mako
diff --git a/templates/webapps/galaxy/workflow/sharing.mako b/lib/galaxy/web/framework/templates/webapps/galaxy/workflow/sharing.mako
similarity index 100%
rename from templates/webapps/galaxy/workflow/sharing.mako
rename to lib/galaxy/web/framework/templates/webapps/galaxy/workflow/sharing.mako
diff --git a/templates/webapps/reports/base_panels.mako b/lib/galaxy/web/framework/templates/webapps/reports/base_panels.mako
similarity index 100%
rename from templates/webapps/reports/base_panels.mako
rename to lib/galaxy/web/framework/templates/webapps/reports/base_panels.mako
diff --git a/templates/webapps/reports/dataset_info.mako b/lib/galaxy/web/framework/templates/webapps/reports/dataset_info.mako
similarity index 100%
rename from templates/webapps/reports/dataset_info.mako
rename to lib/galaxy/web/framework/templates/webapps/reports/dataset_info.mako
diff --git a/templates/webapps/reports/grid.mako b/lib/galaxy/web/framework/templates/webapps/reports/grid.mako
similarity index 100%
rename from templates/webapps/reports/grid.mako
rename to lib/galaxy/web/framework/templates/webapps/reports/grid.mako
diff --git a/templates/webapps/reports/index.mako b/lib/galaxy/web/framework/templates/webapps/reports/index.mako
similarity index 100%
rename from templates/webapps/reports/index.mako
rename to lib/galaxy/web/framework/templates/webapps/reports/index.mako
diff --git a/templates/webapps/reports/job_info.mako b/lib/galaxy/web/framework/templates/webapps/reports/job_info.mako
similarity index 100%
rename from templates/webapps/reports/job_info.mako
rename to lib/galaxy/web/framework/templates/webapps/reports/job_info.mako
diff --git a/templates/webapps/reports/jobs_errors_per_tool.mako b/lib/galaxy/web/framework/templates/webapps/reports/jobs_errors_per_tool.mako
similarity index 100%
rename from templates/webapps/reports/jobs_errors_per_tool.mako
rename to lib/galaxy/web/framework/templates/webapps/reports/jobs_errors_per_tool.mako
diff --git a/templates/webapps/reports/jobs_per_month_all.mako b/lib/galaxy/web/framework/templates/webapps/reports/jobs_per_month_all.mako
similarity index 100%
rename from templates/webapps/reports/jobs_per_month_all.mako
rename to lib/galaxy/web/framework/templates/webapps/reports/jobs_per_month_all.mako
diff --git a/templates/webapps/reports/jobs_per_month_in_error.mako b/lib/galaxy/web/framework/templates/webapps/reports/jobs_per_month_in_error.mako
similarity index 100%
rename from templates/webapps/reports/jobs_per_month_in_error.mako
rename to lib/galaxy/web/framework/templates/webapps/reports/jobs_per_month_in_error.mako
diff --git a/templates/webapps/reports/jobs_per_tool.mako b/lib/galaxy/web/framework/templates/webapps/reports/jobs_per_tool.mako
similarity index 100%
rename from templates/webapps/reports/jobs_per_tool.mako
rename to lib/galaxy/web/framework/templates/webapps/reports/jobs_per_tool.mako
diff --git a/templates/webapps/reports/jobs_per_user.mako b/lib/galaxy/web/framework/templates/webapps/reports/jobs_per_user.mako
similarity index 100%
rename from templates/webapps/reports/jobs_per_user.mako
rename to lib/galaxy/web/framework/templates/webapps/reports/jobs_per_user.mako
diff --git a/templates/webapps/reports/jobs_specified_month_all.mako b/lib/galaxy/web/framework/templates/webapps/reports/jobs_specified_month_all.mako
similarity index 100%
rename from templates/webapps/reports/jobs_specified_month_all.mako
rename to lib/galaxy/web/framework/templates/webapps/reports/jobs_specified_month_all.mako
diff --git a/templates/webapps/reports/jobs_specified_month_in_error.mako b/lib/galaxy/web/framework/templates/webapps/reports/jobs_specified_month_in_error.mako
similarity index 100%
rename from templates/webapps/reports/jobs_specified_month_in_error.mako
rename to lib/galaxy/web/framework/templates/webapps/reports/jobs_specified_month_in_error.mako
diff --git a/templates/webapps/reports/jobs_tool_per_month.mako b/lib/galaxy/web/framework/templates/webapps/reports/jobs_tool_per_month.mako
similarity index 100%
rename from templates/webapps/reports/jobs_tool_per_month.mako
rename to lib/galaxy/web/framework/templates/webapps/reports/jobs_tool_per_month.mako
diff --git a/templates/webapps/reports/jobs_user_per_month.mako b/lib/galaxy/web/framework/templates/webapps/reports/jobs_user_per_month.mako
similarity index 100%
rename from templates/webapps/reports/jobs_user_per_month.mako
rename to lib/galaxy/web/framework/templates/webapps/reports/jobs_user_per_month.mako
diff --git a/templates/webapps/reports/registered_users.mako b/lib/galaxy/web/framework/templates/webapps/reports/registered_users.mako
similarity index 100%
rename from templates/webapps/reports/registered_users.mako
rename to lib/galaxy/web/framework/templates/webapps/reports/registered_users.mako
diff --git a/templates/webapps/reports/registered_users_per_month.mako b/lib/galaxy/web/framework/templates/webapps/reports/registered_users_per_month.mako
similarity index 100%
rename from templates/webapps/reports/registered_users_per_month.mako
rename to lib/galaxy/web/framework/templates/webapps/reports/registered_users_per_month.mako
diff --git a/templates/webapps/reports/registered_users_specified_date.mako b/lib/galaxy/web/framework/templates/webapps/reports/registered_users_specified_date.mako
similarity index 100%
rename from templates/webapps/reports/registered_users_specified_date.mako
rename to lib/galaxy/web/framework/templates/webapps/reports/registered_users_specified_date.mako
diff --git a/templates/webapps/reports/registered_users_specified_month.mako b/lib/galaxy/web/framework/templates/webapps/reports/registered_users_specified_month.mako
similarity index 100%
rename from templates/webapps/reports/registered_users_specified_month.mako
rename to lib/galaxy/web/framework/templates/webapps/reports/registered_users_specified_month.mako
diff --git a/templates/webapps/reports/requests_per_month_all.mako b/lib/galaxy/web/framework/templates/webapps/reports/requests_per_month_all.mako
similarity index 100%
rename from templates/webapps/reports/requests_per_month_all.mako
rename to lib/galaxy/web/framework/templates/webapps/reports/requests_per_month_all.mako
diff --git a/templates/webapps/reports/requests_per_user.mako b/lib/galaxy/web/framework/templates/webapps/reports/requests_per_user.mako
similarity index 100%
rename from templates/webapps/reports/requests_per_user.mako
rename to lib/galaxy/web/framework/templates/webapps/reports/requests_per_user.mako
diff --git a/templates/webapps/reports/requests_user_per_month.mako b/lib/galaxy/web/framework/templates/webapps/reports/requests_user_per_month.mako
similarity index 100%
rename from templates/webapps/reports/requests_user_per_month.mako
rename to lib/galaxy/web/framework/templates/webapps/reports/requests_user_per_month.mako
diff --git a/templates/webapps/reports/run_stats.mako b/lib/galaxy/web/framework/templates/webapps/reports/run_stats.mako
similarity index 100%
rename from templates/webapps/reports/run_stats.mako
rename to lib/galaxy/web/framework/templates/webapps/reports/run_stats.mako
diff --git a/templates/webapps/reports/system.mako b/lib/galaxy/web/framework/templates/webapps/reports/system.mako
similarity index 100%
rename from templates/webapps/reports/system.mako
rename to lib/galaxy/web/framework/templates/webapps/reports/system.mako
diff --git a/templates/webapps/reports/users_last_access_date.mako b/lib/galaxy/web/framework/templates/webapps/reports/users_last_access_date.mako
similarity index 100%
rename from templates/webapps/reports/users_last_access_date.mako
rename to lib/galaxy/web/framework/templates/webapps/reports/users_last_access_date.mako
diff --git a/templates/webapps/reports/users_user_disk_usage.mako b/lib/galaxy/web/framework/templates/webapps/reports/users_user_disk_usage.mako
similarity index 100%
rename from templates/webapps/reports/users_user_disk_usage.mako
rename to lib/galaxy/web/framework/templates/webapps/reports/users_user_disk_usage.mako
diff --git a/templates/webapps/reports/workflows_per_month_all.mako b/lib/galaxy/web/framework/templates/webapps/reports/workflows_per_month_all.mako
similarity index 100%
rename from templates/webapps/reports/workflows_per_month_all.mako
rename to lib/galaxy/web/framework/templates/webapps/reports/workflows_per_month_all.mako
diff --git a/templates/webapps/reports/workflows_per_user.mako b/lib/galaxy/web/framework/templates/webapps/reports/workflows_per_user.mako
similarity index 100%
rename from templates/webapps/reports/workflows_per_user.mako
rename to lib/galaxy/web/framework/templates/webapps/reports/workflows_per_user.mako
diff --git a/templates/webapps/reports/workflows_per_workflow.mako b/lib/galaxy/web/framework/templates/webapps/reports/workflows_per_workflow.mako
similarity index 100%
rename from templates/webapps/reports/workflows_per_workflow.mako
rename to lib/galaxy/web/framework/templates/webapps/reports/workflows_per_workflow.mako
diff --git a/templates/webapps/reports/workflows_user_per_month.mako b/lib/galaxy/web/framework/templates/webapps/reports/workflows_user_per_month.mako
similarity index 100%
rename from templates/webapps/reports/workflows_user_per_month.mako
rename to lib/galaxy/web/framework/templates/webapps/reports/workflows_user_per_month.mako
diff --git a/templates/webapps/tool_shed/admin/center.mako b/lib/galaxy/web/framework/templates/webapps/tool_shed/admin/center.mako
similarity index 100%
rename from templates/webapps/tool_shed/admin/center.mako
rename to lib/galaxy/web/framework/templates/webapps/tool_shed/admin/center.mako
diff --git a/templates/webapps/tool_shed/admin/index.mako b/lib/galaxy/web/framework/templates/webapps/tool_shed/admin/index.mako
similarity index 100%
rename from templates/webapps/tool_shed/admin/index.mako
rename to lib/galaxy/web/framework/templates/webapps/tool_shed/admin/index.mako
diff --git a/templates/webapps/tool_shed/admin/statistics.mako b/lib/galaxy/web/framework/templates/webapps/tool_shed/admin/statistics.mako
similarity index 100%
rename from templates/webapps/tool_shed/admin/statistics.mako
rename to lib/galaxy/web/framework/templates/webapps/tool_shed/admin/statistics.mako
diff --git a/templates/webapps/tool_shed/base_panels.mako b/lib/galaxy/web/framework/templates/webapps/tool_shed/base_panels.mako
similarity index 100%
rename from templates/webapps/tool_shed/base_panels.mako
rename to lib/galaxy/web/framework/templates/webapps/tool_shed/base_panels.mako
diff --git a/templates/webapps/tool_shed/category/create_category.mako b/lib/galaxy/web/framework/templates/webapps/tool_shed/category/create_category.mako
similarity index 100%
rename from templates/webapps/tool_shed/category/create_category.mako
rename to lib/galaxy/web/framework/templates/webapps/tool_shed/category/create_category.mako
diff --git a/templates/webapps/tool_shed/category/edit_category.mako b/lib/galaxy/web/framework/templates/webapps/tool_shed/category/edit_category.mako
similarity index 100%
rename from templates/webapps/tool_shed/category/edit_category.mako
rename to lib/galaxy/web/framework/templates/webapps/tool_shed/category/edit_category.mako
diff --git a/templates/webapps/tool_shed/category/grid.mako b/lib/galaxy/web/framework/templates/webapps/tool_shed/category/grid.mako
similarity index 100%
rename from templates/webapps/tool_shed/category/grid.mako
rename to lib/galaxy/web/framework/templates/webapps/tool_shed/category/grid.mako
diff --git a/templates/webapps/tool_shed/category/valid_grid.mako b/lib/galaxy/web/framework/templates/webapps/tool_shed/category/valid_grid.mako
similarity index 100%
rename from templates/webapps/tool_shed/category/valid_grid.mako
rename to lib/galaxy/web/framework/templates/webapps/tool_shed/category/valid_grid.mako
diff --git a/templates/webapps/tool_shed/common/common.mako b/lib/galaxy/web/framework/templates/webapps/tool_shed/common/common.mako
similarity index 100%
rename from templates/webapps/tool_shed/common/common.mako
rename to lib/galaxy/web/framework/templates/webapps/tool_shed/common/common.mako
diff --git a/templates/webapps/tool_shed/common/grid_common.mako b/lib/galaxy/web/framework/templates/webapps/tool_shed/common/grid_common.mako
similarity index 100%
rename from templates/webapps/tool_shed/common/grid_common.mako
rename to lib/galaxy/web/framework/templates/webapps/tool_shed/common/grid_common.mako
diff --git a/templates/webapps/tool_shed/common/repository_actions_menu.mako b/lib/galaxy/web/framework/templates/webapps/tool_shed/common/repository_actions_menu.mako
similarity index 100%
rename from templates/webapps/tool_shed/common/repository_actions_menu.mako
rename to lib/galaxy/web/framework/templates/webapps/tool_shed/common/repository_actions_menu.mako
diff --git a/templates/webapps/tool_shed/common/reset_metadata_on_selected_repositories.mako b/lib/galaxy/web/framework/templates/webapps/tool_shed/common/reset_metadata_on_selected_repositories.mako
similarity index 100%
rename from templates/webapps/tool_shed/common/reset_metadata_on_selected_repositories.mako
rename to lib/galaxy/web/framework/templates/webapps/tool_shed/common/reset_metadata_on_selected_repositories.mako
diff --git a/templates/webapps/tool_shed/group/index.mako b/lib/galaxy/web/framework/templates/webapps/tool_shed/group/index.mako
similarity index 100%
rename from templates/webapps/tool_shed/group/index.mako
rename to lib/galaxy/web/framework/templates/webapps/tool_shed/group/index.mako
diff --git a/templates/webapps/tool_shed/index.mako b/lib/galaxy/web/framework/templates/webapps/tool_shed/index.mako
similarity index 100%
rename from templates/webapps/tool_shed/index.mako
rename to lib/galaxy/web/framework/templates/webapps/tool_shed/index.mako
diff --git a/templates/webapps/tool_shed/repository/browse_repository.mako b/lib/galaxy/web/framework/templates/webapps/tool_shed/repository/browse_repository.mako
similarity index 100%
rename from templates/webapps/tool_shed/repository/browse_repository.mako
rename to lib/galaxy/web/framework/templates/webapps/tool_shed/repository/browse_repository.mako
diff --git a/templates/webapps/tool_shed/repository/common.mako b/lib/galaxy/web/framework/templates/webapps/tool_shed/repository/common.mako
similarity index 100%
rename from templates/webapps/tool_shed/repository/common.mako
rename to lib/galaxy/web/framework/templates/webapps/tool_shed/repository/common.mako
diff --git a/templates/webapps/tool_shed/repository/contact_owner.mako b/lib/galaxy/web/framework/templates/webapps/tool_shed/repository/contact_owner.mako
similarity index 100%
rename from templates/webapps/tool_shed/repository/contact_owner.mako
rename to lib/galaxy/web/framework/templates/webapps/tool_shed/repository/contact_owner.mako
diff --git a/templates/webapps/tool_shed/repository/create_repository.mako b/lib/galaxy/web/framework/templates/webapps/tool_shed/repository/create_repository.mako
similarity index 100%
rename from templates/webapps/tool_shed/repository/create_repository.mako
rename to lib/galaxy/web/framework/templates/webapps/tool_shed/repository/create_repository.mako
diff --git a/templates/webapps/tool_shed/repository/docker_image_repositories.mako b/lib/galaxy/web/framework/templates/webapps/tool_shed/repository/docker_image_repositories.mako
similarity index 100%
rename from templates/webapps/tool_shed/repository/docker_image_repositories.mako
rename to lib/galaxy/web/framework/templates/webapps/tool_shed/repository/docker_image_repositories.mako
diff --git a/templates/webapps/tool_shed/repository/export_repository.mako b/lib/galaxy/web/framework/templates/webapps/tool_shed/repository/export_repository.mako
similarity index 100%
rename from templates/webapps/tool_shed/repository/export_repository.mako
rename to lib/galaxy/web/framework/templates/webapps/tool_shed/repository/export_repository.mako
diff --git a/templates/webapps/tool_shed/repository/find_tools.mako b/lib/galaxy/web/framework/templates/webapps/tool_shed/repository/find_tools.mako
similarity index 100%
rename from templates/webapps/tool_shed/repository/find_tools.mako
rename to lib/galaxy/web/framework/templates/webapps/tool_shed/repository/find_tools.mako
diff --git a/templates/webapps/tool_shed/repository/find_workflows.mako b/lib/galaxy/web/framework/templates/webapps/tool_shed/repository/find_workflows.mako
similarity index 100%
rename from templates/webapps/tool_shed/repository/find_workflows.mako
rename to lib/galaxy/web/framework/templates/webapps/tool_shed/repository/find_workflows.mako
diff --git a/templates/webapps/tool_shed/repository/grid.mako b/lib/galaxy/web/framework/templates/webapps/tool_shed/repository/grid.mako
similarity index 100%
rename from templates/webapps/tool_shed/repository/grid.mako
rename to lib/galaxy/web/framework/templates/webapps/tool_shed/repository/grid.mako
diff --git a/templates/webapps/tool_shed/repository/import_capsule.mako b/lib/galaxy/web/framework/templates/webapps/tool_shed/repository/import_capsule.mako
similarity index 100%
rename from templates/webapps/tool_shed/repository/import_capsule.mako
rename to lib/galaxy/web/framework/templates/webapps/tool_shed/repository/import_capsule.mako
diff --git a/templates/webapps/tool_shed/repository/import_capsule_results.mako b/lib/galaxy/web/framework/templates/webapps/tool_shed/repository/import_capsule_results.mako
similarity index 100%
rename from templates/webapps/tool_shed/repository/import_capsule_results.mako
rename to lib/galaxy/web/framework/templates/webapps/tool_shed/repository/import_capsule_results.mako
diff --git a/templates/webapps/tool_shed/repository/manage_repository.mako b/lib/galaxy/web/framework/templates/webapps/tool_shed/repository/manage_repository.mako
similarity index 100%
rename from templates/webapps/tool_shed/repository/manage_repository.mako
rename to lib/galaxy/web/framework/templates/webapps/tool_shed/repository/manage_repository.mako
diff --git a/templates/webapps/tool_shed/repository/preview_tools_in_changeset.mako b/lib/galaxy/web/framework/templates/webapps/tool_shed/repository/preview_tools_in_changeset.mako
similarity index 100%
rename from templates/webapps/tool_shed/repository/preview_tools_in_changeset.mako
rename to lib/galaxy/web/framework/templates/webapps/tool_shed/repository/preview_tools_in_changeset.mako
diff --git a/templates/webapps/tool_shed/repository/rate_repository.mako b/lib/galaxy/web/framework/templates/webapps/tool_shed/repository/rate_repository.mako
similarity index 100%
rename from templates/webapps/tool_shed/repository/rate_repository.mako
rename to lib/galaxy/web/framework/templates/webapps/tool_shed/repository/rate_repository.mako
diff --git a/templates/webapps/tool_shed/repository/tool_form.mako b/lib/galaxy/web/framework/templates/webapps/tool_shed/repository/tool_form.mako
similarity index 100%
rename from templates/webapps/tool_shed/repository/tool_form.mako
rename to lib/galaxy/web/framework/templates/webapps/tool_shed/repository/tool_form.mako
diff --git a/templates/webapps/tool_shed/repository/upload.mako b/lib/galaxy/web/framework/templates/webapps/tool_shed/repository/upload.mako
similarity index 100%
rename from templates/webapps/tool_shed/repository/upload.mako
rename to lib/galaxy/web/framework/templates/webapps/tool_shed/repository/upload.mako
diff --git a/templates/webapps/tool_shed/repository/upload_capsule.mako b/lib/galaxy/web/framework/templates/webapps/tool_shed/repository/upload_capsule.mako
similarity index 100%
rename from templates/webapps/tool_shed/repository/upload_capsule.mako
rename to lib/galaxy/web/framework/templates/webapps/tool_shed/repository/upload_capsule.mako
diff --git a/templates/webapps/tool_shed/repository/view_changelog.mako b/lib/galaxy/web/framework/templates/webapps/tool_shed/repository/view_changelog.mako
similarity index 100%
rename from templates/webapps/tool_shed/repository/view_changelog.mako
rename to lib/galaxy/web/framework/templates/webapps/tool_shed/repository/view_changelog.mako
diff --git a/templates/webapps/tool_shed/repository/view_changeset.mako b/lib/galaxy/web/framework/templates/webapps/tool_shed/repository/view_changeset.mako
similarity index 100%
rename from templates/webapps/tool_shed/repository/view_changeset.mako
rename to lib/galaxy/web/framework/templates/webapps/tool_shed/repository/view_changeset.mako
diff --git a/templates/webapps/tool_shed/repository/view_repository.mako b/lib/galaxy/web/framework/templates/webapps/tool_shed/repository/view_repository.mako
similarity index 100%
rename from templates/webapps/tool_shed/repository/view_repository.mako
rename to lib/galaxy/web/framework/templates/webapps/tool_shed/repository/view_repository.mako
diff --git a/templates/webapps/tool_shed/repository/view_tool_metadata.mako b/lib/galaxy/web/framework/templates/webapps/tool_shed/repository/view_tool_metadata.mako
similarity index 100%
rename from templates/webapps/tool_shed/repository/view_tool_metadata.mako
rename to lib/galaxy/web/framework/templates/webapps/tool_shed/repository/view_tool_metadata.mako
diff --git a/templates/webapps/tool_shed/repository/view_workflow.mako b/lib/galaxy/web/framework/templates/webapps/tool_shed/repository/view_workflow.mako
similarity index 100%
rename from templates/webapps/tool_shed/repository/view_workflow.mako
rename to lib/galaxy/web/framework/templates/webapps/tool_shed/repository/view_workflow.mako
diff --git a/templates/webapps/tool_shed/repository_review/browse_review.mako b/lib/galaxy/web/framework/templates/webapps/tool_shed/repository_review/browse_review.mako
similarity index 100%
rename from templates/webapps/tool_shed/repository_review/browse_review.mako
rename to lib/galaxy/web/framework/templates/webapps/tool_shed/repository_review/browse_review.mako
diff --git a/templates/webapps/tool_shed/repository_review/create_component.mako b/lib/galaxy/web/framework/templates/webapps/tool_shed/repository_review/create_component.mako
similarity index 100%
rename from templates/webapps/tool_shed/repository_review/create_component.mako
rename to lib/galaxy/web/framework/templates/webapps/tool_shed/repository_review/create_component.mako
diff --git a/templates/webapps/tool_shed/repository_review/edit_component.mako b/lib/galaxy/web/framework/templates/webapps/tool_shed/repository_review/edit_component.mako
similarity index 100%
rename from templates/webapps/tool_shed/repository_review/edit_component.mako
rename to lib/galaxy/web/framework/templates/webapps/tool_shed/repository_review/edit_component.mako
diff --git a/templates/webapps/tool_shed/repository_review/edit_review.mako b/lib/galaxy/web/framework/templates/webapps/tool_shed/repository_review/edit_review.mako
similarity index 100%
rename from templates/webapps/tool_shed/repository_review/edit_review.mako
rename to lib/galaxy/web/framework/templates/webapps/tool_shed/repository_review/edit_review.mako
diff --git a/templates/webapps/tool_shed/repository_review/grid.mako b/lib/galaxy/web/framework/templates/webapps/tool_shed/repository_review/grid.mako
similarity index 100%
rename from templates/webapps/tool_shed/repository_review/grid.mako
rename to lib/galaxy/web/framework/templates/webapps/tool_shed/repository_review/grid.mako
diff --git a/templates/webapps/tool_shed/repository_review/reviews_of_changeset_revision.mako b/lib/galaxy/web/framework/templates/webapps/tool_shed/repository_review/reviews_of_changeset_revision.mako
similarity index 100%
rename from templates/webapps/tool_shed/repository_review/reviews_of_changeset_revision.mako
rename to lib/galaxy/web/framework/templates/webapps/tool_shed/repository_review/reviews_of_changeset_revision.mako
diff --git a/templates/webapps/tool_shed/repository_review/reviews_of_repository.mako b/lib/galaxy/web/framework/templates/webapps/tool_shed/repository_review/reviews_of_repository.mako
similarity index 100%
rename from templates/webapps/tool_shed/repository_review/reviews_of_repository.mako
rename to lib/galaxy/web/framework/templates/webapps/tool_shed/repository_review/reviews_of_repository.mako
diff --git a/templates/webapps/tool_shed/repository_review/select_previous_review.mako b/lib/galaxy/web/framework/templates/webapps/tool_shed/repository_review/select_previous_review.mako
similarity index 100%
rename from templates/webapps/tool_shed/repository_review/select_previous_review.mako
rename to lib/galaxy/web/framework/templates/webapps/tool_shed/repository_review/select_previous_review.mako
diff --git a/templates/webapps/tool_shed/role/role.mako b/lib/galaxy/web/framework/templates/webapps/tool_shed/role/role.mako
similarity index 100%
rename from templates/webapps/tool_shed/role/role.mako
rename to lib/galaxy/web/framework/templates/webapps/tool_shed/role/role.mako
diff --git a/templates/webapps/tool_shed/user/manage_email_alerts.mako b/lib/galaxy/web/framework/templates/webapps/tool_shed/user/manage_email_alerts.mako
similarity index 100%
rename from templates/webapps/tool_shed/user/manage_email_alerts.mako
rename to lib/galaxy/web/framework/templates/webapps/tool_shed/user/manage_email_alerts.mako
diff --git a/templates/webapps/tool_shed/user/manage_info.mako b/lib/galaxy/web/framework/templates/webapps/tool_shed/user/manage_info.mako
similarity index 100%
rename from templates/webapps/tool_shed/user/manage_info.mako
rename to lib/galaxy/web/framework/templates/webapps/tool_shed/user/manage_info.mako