Redone comments
...
rebuilded dir structure
...