Rename namespaces; restructure directories