Source file duplication removal + first steps with grammar