Refactoring the directory structure