Feature/70684784 jamesv namespace folder structure