services moved to separate directories