Some small bugfixes

* Restructured project
* Added new chapter