Begin modularizing.
Modularized.
Unloading/reloading now works.
Merge remote-tracking branch 'origin/master'