54 File and directory structure refactoring