Refactoring project folder structure
Refactoring project folder structure
Modifying the infrastructure scripts for the new folder structure