Integration tests, updated repo layout