Updated makefile
Changed makefile to track correct location of cin.h
Modified to use new layout
Updated makefile to use new structure
Rebuilt to use new structure of library