Moved octet data types to include subdir as they'll be part of external interface