Unit 2 added, also directory structure modified