Restructure project and sync local as source of truth

9107a5d