Moved zones and refinements
All serialization working
Everything working except deserialization (doctrine autoloading
problems)
Got all tests working again (other than decode)
All tests passing