Removed/Renamed some classes to reduce overhead. Added some verify functionality in.