Services moved to lib directory