Restructuring and new Trait/Extension handling.