Abstract slightly the custom package locations
Removed unused submodules