shifting around the namespace'd classes to be a little better structured
M