Move things around a bit, as per gmc's suggestions.
Move things around a bit, as per gmc's suggestions.

Change-Id: I2a9ad8aef73cdfc3cd7c18b1e782fe9f0f3d0ec7

geoffreyanderson/opentsdb.net,geoffreyanderson/opentsdb.net,manolama/opentsdb.net,geoffreyanderson/opentsdb.net,OpenTSDB/opentsdb.net,OpenTSDB/opentsdb.net,OpenTSDB/opentsdb.net,manolama/opentsdb.net,manolama/opentsdb.net