Moved files to lib directory