Revamp of base application
Mappers to represent new structure