Revert "Started on a more friendly way of doing modules"

This reverts commit f95b7f9e59b75c04dda29d386fd383ecd7906c72.