Move toolkit independent components 2 levels up