re-org so we have flatter structure

seems consistent with how others are structure their repos