Refactor all services, relocation of files