Added folder structure and organised root