Repo Structure Fixes