Changes to cs496 structure