Uploading week1
Improved several classes