new code structure, code cleanup and service implementation.