More refactoring
Restructured folders