Revert "Changed static abstract classes to modules"

This reverts commit c623b673cf409fc86585626e085e3536f6ade7c3.

Reverting class to module change