Fixing double imports by moving support files out of the way.