Updated classes
moved classes to util repo
newer version of spinner