Reorganize so it will build correctly