Restructured file names and fixed typo in section names