Rearranged scafolding to fit modules described in Wiki