Further filestructure fixes

Changed some more internal stuff