remove dead code
file rename
file consolidation
allow to be run without require