added persistence module and service-modules, removed some model classes