Changes to filestructure