changed filenames
applied new module names
wired some things up, improved some patterns