Regroup files; create target for integration tests