Shifting around source files

- Breaking apart the import and serve functions into separate modules