Organized files into folders; added Makefile; fixed errors