Minor file structure update