Changed class base to element and removed unnecessary methods

Removed unnecessary helper classes files