Moved folder up a level, removed lib folder.  This is to make it easier
with git submodules