Renaming civs.model to civs.model.core