TEMP:
1. Modify the project architecture