moved around and renamed a few things

Change-Id: If8026f2f76e917c9d46a33d60ab6772554157f24