Finished homework3.

Finished restructuring.
Merged remote into local by removing file.