Added to/from JSON methods to Dropbox classes
Tidied code order, moving towards JSON-based storage