Moved services into own service package