Fixes #611: Moving kmeans.py to models

Also changing one dependency to the new location