Moved library files to Classes