Include only support code in the form of ordinary functions.
Rename for better naming convention.
Fix error in comments.
New files for definitions of ADD-METHOD and REMOVE-METHOD.