ahammett: slight repo structure change