Added option class
Added Helpers class for helpers functions
Moved some more functions to helpers class