Accidenly made some classes internal. Made them public again