Re-structured workspace and added assignments