Simplified structure

* Now every class instances his own objects