5 - Refactor Design and Data dirs