Modified directory structure to be compliant with guidelines

And also removed unnecessary  comments