All table names modified from plural to singular plus slight refactoring of Mappers made