Made Basic Components as core instead of inclusive