Merge current work in progress

* Prepared basic structure
* Cleaned up dependencies