made Moves files for refactoring
merge