Moving stuff around - WIP
beginning for integration tests
Merge branch '1_4_refactor' of github.com:Strider-CD/strider into 1_4_refactor