Fix to filestructure