Update to match current Github Structure