Refactoring of filestructure