More install fixes (all artifacts need to be on the same directory level)