Changed layout of manifests and located logic logically.