Rearranged and started adding modules