Moved classes from geo to lib.