Have storage utilities include modules in 'main' instead of extending Object.new.