Renamed confusingly named class, and moved to appropriate package.