Reorganizing structure & add assignment 1