Renaming and split in to official and extra