Yeah, it works. Mostly
Cleaner now with subpackages