Major move of files for refactoring