Moved URI into the primitive types and cleaned out all of the EAJava_ references