Refactored folders and namespaces