MOD: Modified directory structure. Made merge compile.
MERGE: Resolved paratype.go conflicts.