moved service classes into appropriate namespace