Changed to a package-based structure
Bugfix