restructure is now usable and replaces old implementation, extension support still misisng