Moving extensions and API versions into different sub-packages; fixing test helper methods
20 files changed