split into related files, added prepositions