Move files around and add small statsd probes
Delete old stuff