Added initial module manager to manage modules
Needs a cleanup
Clean up