WIP moving some things around

Change-Id: Id0a35d86fe29efdbda72d9542c13f8c02f67a9cc