Change file structure slightly