fixing typos and consolidating directory