Reorganized folder contents and fixed typos