Fase 1

Base classes added