* Cleaned fs structure

* Names now make sense
* Modules slightly commented