Rewrite

Namespaces, easier use, ..