Overhaul on the loading

Just changed a minor thing, updated the API, the module system is not
as strict anymore