Moved all types definition into defs-pkg.R

Conflicts:
	DESCRIPTION