Key charing in NFC pairing + Reorganized imports in all files