Refactoring integration tests
Folder re-organization