s6 - Cleaning is complete. The Model Project is redesigned (All needs to be reviewed by Tomas)