Add base task and option classes
Add, rename base classes