Adapting this project to the defined architecture