Moved files to separate lib directory in prep for adding tests
Changed name of folder