Fixed directory structure, changed namespace and allowing subfolders