fixing typos and file structure