Added and updated class prototypes and definitions for future use. Also,
reorganized definitions to match the order of the prototypes.
Trivial change: Cleaning up some stray whitespace characters.