Reorganize models and implement dataentry for translations