reorganizing, adding manifest