Update and rename Base.hpp to Base.h