Renaming to conform to standards.
Removed Stack class, not used in this version.