Rearranged dependencies to mark which ones can probably be pulled out w/ generators
Removed inflection dep