Moved library to base