Add HW3 & general reorganisation