Minor file structure changes