optimize build time (move stuff from hpp to cpp)

optimize build time (move stuff from hpp to cpp) #2699