Added the base class and the base folders