Changed the project folder structures Abhi|Melanie