renamed namespace
accidental find replace
changed namespace back
reworked a few classes