refactor
fixes
alignment to new structure
more fixes for c++ 03
fix