updated directories/names, for logic's sake