- a bit of refactoring in Uploader
- started implementing models for Bookie service