moved classes to packages (in service module)