More Filestructure Fixes