grant period update, some re-org

closes #163