Version update
Rearranged files, and tidied serializers