File structure fixes