Moved inspections into subpackages