updated files
Changed structure and complete Task F2
Completed TaskF3