Filestructure overhaul