Bugfix invalid class name + add subpackage for deployment scanner