Changed file structure for integration tests