.tp2 changes for compilation and structure