Removed Migration, Fixed Mapping Files