Fixed the merge and improvements on the services
upate of the project module and code style