Refactor to use single-directory format (and garagepi, not garage-pi.