moved stuff around

- added new namespace approach
- renamed stuff, reorganized
refined a lot of stuff, killed even more
before heading in