refactoring folders
cleaning main file