moved function bodies out of header file
changed file names for lib