[IMP] Some improvements + one file per interface