renamed and merged files; created command stubs to reduce verbosity