Move goals into own app & directory