Restructures CS4620 and added CS4621