Moved stuff around

Change-Id: Id90e07af0fd1965418028e7981aa184827e7cfe0