Moved ComponentBase to Component/Base
Moved AdaptorBase to Component/Adaptor