Revert "updated for cleaner modules"

This reverts commit b476652ed0e8fcabaf4815cc17bba4b8e19e29c1.
Revert "updated for new features"

This reverts commit 543a217767a5893bb75cd21beb42f27ebaf314d8.
Revert "updated comments and tests for new features"

This reverts commit f67d2df87aa95a5002211198f5ae622e423a769d.