Add ability to load/unload modules, refractor code a bit.