Remade project scaffold. Use single namespaces