Moved headers around

Change-Id: I6eafe85210480fa00e8d24247f44107a5bd800bc