Added support for the new generated header file
Moved the final position of the generated header file
Removed the old test project