Joebot persistent

- Mostly to update the structure of the source code.