Removing unnecessary files. Moving stuff around.
Still moving files around in the refactor.
Moving tests into sub namespace.
More work towards refactoring.