namespaces and files hierarchy were fixed