Change file hierarchy to match the logic one.