Changed folder structure
Modifying main layout