DELTASPIKE-399 Moved to literal package to align with existing convention.
DELTASPIKE-399 incorporated more design discussion changes.
Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/deltaspike