Fixing imports for Architecture.