Re-sorted modules in make file