- restructure part 1
- Complete restructure of the project