Moved some services into their own modules