Revert "Splitting header into header and cxx file"

This reverts commit f49708b53a5a1bf682f4c6ae344ee48adba879c5.