Reorder and add module installs