changed namespace and folder names