Restructure and add mappers