Moved files to lib/