merge UseCases and Goals

(I never actually created Goals)