added the refactor
added the rest of the refactor to make it correct in terms of imports
moved the serializer too, since it didn't make much sense there either
fixed import
Merge pull request #17 from tmathmeyer/master

packages fixed pls ty