Reorg files, add ability to retrieve shot-out gumball (incomplete)