move monitoring related stuff from endpoint/ to monitoring/