Move to subproject and adjust headers