New Classes

Rebuilding classes to enhance the addon