Finished the reorgaanization from the previous commit