Restructure folder hierarchy on integration tests