Moved countsbycity to data directory