Organize imports, I need to think of a good enough way to settle PropQueries.