Update architecture of the project folder, everything neatly organized - THIS NEEDS TO BE MAINTAINED IN EVERY SPRINT