Reordering and adding in more modules for build