re-organize the project and added service