JARVIS-495 refactored dir structure. fixed .travis