(maint) Move files and make MVC like
(maint) Remove deleted files