Move Serializers class to correct package.
Merge branch 'master' into two-dot-o

Conflicts:
	.gitignore