housecleaning; clean up comments, restructure some directories, switch to lodash templates instead of util.format