Renamed some classes and finished correcting issues so that the lib now compiles and links