Moved data types to mcnp5 and mcnpx packages.
Removed some redundant statements.