Added missing file.
Refactoring everything to return a response.
Removed deadish files.
Removing dead files. Adding tests to mappers.