Update package structure

* Removed unnecassary my. from pakcage structure.
* Adapted everything to the change.