refactoring file structure
still cleaning up files