Move services to the lib directory