Initial cleanup; remaster

Cleaned up some things: Replaced Module Manager with 2.1.4, copied last
known new source files over older(?) files.