Getting rid of Kernel stuff (except test file -> to be ported) and sweetening up the Locator and Registry.