Re-arrange code structure so that we can support debian and ubuntu, but just not for nfs