Fixed inconsistent directory naming structure. Eliminated unused code