[MODIFIERS, REDESIGN] Move all modifiers into a new sub-package.
[TESTS, REDESIGN] Move tests into package that they test.
[MISC] Cleanup some comments...