DRY up the references
renamed files to remove git challenge