Restructured files and fixed typos