diff --git a/lang/en_utf8/repository_alfresco.php b/repository/alfresco/lang/en_utf8/repository_alfresco.php
similarity index 100%
rename from lang/en_utf8/repository_alfresco.php
rename to repository/alfresco/lang/en_utf8/repository_alfresco.php
diff --git a/lang/en_utf8/repository_boxnet.php b/repository/boxnet/lang/en_utf8/repository_boxnet.php
similarity index 100%
rename from lang/en_utf8/repository_boxnet.php
rename to repository/boxnet/lang/en_utf8/repository_boxnet.php
diff --git a/lang/en_utf8/repository_draft.php b/repository/draft/lang/en_utf8/repository_draft.php
similarity index 100%
rename from lang/en_utf8/repository_draft.php
rename to repository/draft/lang/en_utf8/repository_draft.php
diff --git a/lang/en_utf8/repository_filesystem.php b/repository/filesystem/lang/en_utf8/repository_filesystem.php
similarity index 100%
rename from lang/en_utf8/repository_filesystem.php
rename to repository/filesystem/lang/en_utf8/repository_filesystem.php
diff --git a/lang/en_utf8/repository_flickr.php b/repository/flickr/lang/en_utf8/repository_flickr.php
similarity index 100%
rename from lang/en_utf8/repository_flickr.php
rename to repository/flickr/lang/en_utf8/repository_flickr.php
diff --git a/lang/en_utf8/repository_flickr_public.php b/repository/flickr_public/lang/en_utf8/repository_flickr_public.php
similarity index 100%
rename from lang/en_utf8/repository_flickr_public.php
rename to repository/flickr_public/lang/en_utf8/repository_flickr_public.php
diff --git a/lang/en_utf8/repository_googledocs.php b/repository/googledocs/lang/en_utf8/repository_googledocs.php
similarity index 100%
rename from lang/en_utf8/repository_googledocs.php
rename to repository/googledocs/lang/en_utf8/repository_googledocs.php
diff --git a/lang/en_utf8/repository_local.php b/repository/local/lang/en_utf8/repository_local.php
similarity index 100%
rename from lang/en_utf8/repository_local.php
rename to repository/local/lang/en_utf8/repository_local.php
diff --git a/lang/en_utf8/repository_mahara.php b/repository/mahara/lang/en_utf8/repository_mahara.php
similarity index 100%
rename from lang/en_utf8/repository_mahara.php
rename to repository/mahara/lang/en_utf8/repository_mahara.php
diff --git a/lang/en_utf8/repository_merlot.php b/repository/merlot/lang/en_utf8/repository_merlot.php
similarity index 100%
rename from lang/en_utf8/repository_merlot.php
rename to repository/merlot/lang/en_utf8/repository_merlot.php
diff --git a/lang/en_utf8/repository_picasa.php b/repository/picasa/lang/en_utf8/repository_picasa.php
similarity index 100%
rename from lang/en_utf8/repository_picasa.php
rename to repository/picasa/lang/en_utf8/repository_picasa.php
diff --git a/lang/en_utf8/repository_remotemoodle.php b/repository/remotemoodle/lang/en_utf8/repository_remotemoodle.php
similarity index 100%
rename from lang/en_utf8/repository_remotemoodle.php
rename to repository/remotemoodle/lang/en_utf8/repository_remotemoodle.php
diff --git a/lang/en_utf8/repository_s3.php b/repository/s3/lang/en_utf8/repository_s3.php
similarity index 100%
rename from lang/en_utf8/repository_s3.php
rename to repository/s3/lang/en_utf8/repository_s3.php
diff --git a/lang/en_utf8/repository_upload.php b/repository/upload/lang/en_utf8/repository_upload.php
similarity index 100%
rename from lang/en_utf8/repository_upload.php
rename to repository/upload/lang/en_utf8/repository_upload.php
diff --git a/lang/en_utf8/repository_url.php b/repository/url/lang/en_utf8/repository_url.php
similarity index 100%
rename from lang/en_utf8/repository_url.php
rename to repository/url/lang/en_utf8/repository_url.php
diff --git a/lang/en_utf8/repository_webdav.php b/repository/webdav/lang/en_utf8/repository_webdav.php
similarity index 100%
rename from lang/en_utf8/repository_webdav.php
rename to repository/webdav/lang/en_utf8/repository_webdav.php
diff --git a/lang/en_utf8/repository_wikimedia.php b/repository/wikimedia/lang/en_utf8/repository_wikimedia.php
similarity index 100%
rename from lang/en_utf8/repository_wikimedia.php
rename to repository/wikimedia/lang/en_utf8/repository_wikimedia.php
diff --git a/lang/en_utf8/repository_youtube.php b/repository/youtube/lang/en_utf8/repository_youtube.php
similarity index 100%
rename from lang/en_utf8/repository_youtube.php
rename to repository/youtube/lang/en_utf8/repository_youtube.php