Rename modifiers for clarity and move to sub-package