Updated directory structure, and service test.