restructuring. adding n8020 support