Refactor OOP/EDA

* simplify package and scripts names
* TODO cleanup
* some minor changes alsmost everywhere...