manifest changes
module config/manifest changes
- move files around
- remove tests that I'm not using.