restructure cs61a for consistency