Relocate some things and remove some others.

Change-Id: I548240c168e486131c64cb20579c189555326166
Signed-off-by: Derek Cannata <thederekjay@gmail.com>