Restructured the name space, so it thinks I have to add all these again...