move classes to Services namespace