re-organized directories