4.0

* Added Bootstrapping
* Reorganized solution