Changed files locations
Started refactoring
Refactorgin (work in progress)