Revert "Revert "General rework of some code, fixes, features & rename package""

This reverts commit 8bfaab830facd9fa40181382f34cb81808877ca3.