Moved stuff out of the default package.
Added sustainment structure.