Fixed errors with file locations.

Moved some files to the correct folders where they should be. Filex use of
Serializer interface instead of SerializerImpl.