Updated folder structure

- comments