Moved files from private to lib