Update and rename Base.h to Base.hpp