restructure project and tweak namespaces