This reverts commit 38e7a359109115f4e3d6fdda963009e3544a6ef3.
* renamed module * renamed code * more renames * cleanup