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

This reverts commit ed3958ac9bab93d5b121d323a7c396f8b75d418f.