refactor gp framework
Merge pull request #1187 from votjakovr/feature/gp_refactoring

refactor gp framework