Made the modules sensible