moved the mappers into a new package and separate directory