changing namespace and organizing files in folders