slight reorganization with creation of services folder