Removing dead classes and moving internal loader stuff into the logic package.