Refactored, simplified tests' serviceWrapper
Removed unneeded file.
Reorganizing project files.
Updated .travis.yml so the project will run tests correctly after reorganization.