Refactored packages.
Tenative fix for hidden bugs in extension loading.
Merge pull request #166 from EntityReborn/master

Refactored packages.