added services functionality and mocks with new file structure