Refactor and organize project and Services