More file structure fixes