Changed around file structure.