Refactored structure to allow for cleaner integration in thirdparty projects
Testing with Travis-CI