Milestone 3 update, rearranging files