Further changing of namespace, explode command, cleanup. Fixes #24