Cleanup, removed extra /xyz directory