Restructure of adapters