Refactoring folder layout