Repo Structure: Updates to the latest repo structure and cleans code up.