Added all files
Fixed some conflicts