Rearranged some of the classes to be put in "modules"