reorganized files, updated comments in a few files