renamed and organized directories