Just comments
Simplified dir structure
A lot of minor changes and bugfixes