More refactoring of comments and file arrangement