Cleaned up class/module defs and got rid of Bundler.require