Refactoring the filestructure