Created classes
Moved classes to own folder in /lib