Fixing missed classes in restructure