restructured file tree to support integrationTest