cleanup generated package files
fix non closed namespace
fix includes