Revert "Re-sorted modules in make file"

This reverts commit 23697d02d8f471980d0305f9638ec59f83cbcd21.