Cleaning up filestructure