Reorganized modules to be in the order they're supposed to be built