namespace and folders adjustments