consolidated modules into npm format, renamed some stuff to reflect current usage.