Moved marshalling code to marshall subproject