diff --git a/Core/src/org/sleuthkit/autopsy/commandlineingest/CommandLineIngestManager.java b/Core/src/org/sleuthkit/autopsy/commandlineingest/CommandLineIngestManager.java
index b64d4dda05..8a6d7a7644 100755
--- a/Core/src/org/sleuthkit/autopsy/commandlineingest/CommandLineIngestManager.java
+++ b/Core/src/org/sleuthkit/autopsy/commandlineingest/CommandLineIngestManager.java
@@ -60,8 +60,8 @@ import org.sleuthkit.autopsy.ingest.IngestModuleError;
 import org.sleuthkit.autopsy.ingest.IngestProfiles;
 import org.sleuthkit.autopsy.modules.interestingitems.FilesSet;
 import org.sleuthkit.autopsy.modules.interestingitems.FilesSetsManager;
-import org.sleuthkit.autopsy.report.ReportProgressLogger;
-import org.sleuthkit.autopsy.report.ReportGenerator;
+import org.sleuthkit.autopsy.report.infrastructure.ReportProgressLogger;
+import org.sleuthkit.autopsy.report.infrastructure.ReportGenerator;
 import org.sleuthkit.datamodel.Content;
 import org.sleuthkit.datamodel.TskCoreException;
 
diff --git a/Core/src/org/sleuthkit/autopsy/commandlineingest/CommandLineIngestSettingsPanel.java b/Core/src/org/sleuthkit/autopsy/commandlineingest/CommandLineIngestSettingsPanel.java
index 4f0cf7dc75..ad754eefba 100755
--- a/Core/src/org/sleuthkit/autopsy/commandlineingest/CommandLineIngestSettingsPanel.java
+++ b/Core/src/org/sleuthkit/autopsy/commandlineingest/CommandLineIngestSettingsPanel.java
@@ -26,7 +26,7 @@ import org.sleuthkit.autopsy.ingest.IngestJobSettings;
 import org.sleuthkit.autopsy.ingest.IngestJobSettingsPanel;
 import org.openide.windows.WindowManager;
 import org.sleuthkit.autopsy.coreutils.Logger;
-import static org.sleuthkit.autopsy.report.ReportWizardAction.doReportWizard;
+import static org.sleuthkit.autopsy.report.infrastructure.ReportWizardAction.doReportWizard;
 
 /**
  * Configuration panel for auto ingest settings.
diff --git a/Core/src/org/sleuthkit/autopsy/core/layer.xml b/Core/src/org/sleuthkit/autopsy/core/layer.xml
index 4706ea1b1d..ed4b8cc55d 100644
--- a/Core/src/org/sleuthkit/autopsy/core/layer.xml
+++ b/Core/src/org/sleuthkit/autopsy/core/layer.xml
@@ -220,8 +220,8 @@
                     <attr name="originalFile" stringvalue="Actions/Tools/org-sleuthkit-autopsy-ingest-RunIngestAction.instance"/>
                 </file>
             </folder>
-            <!--<file name="org-sleuthkit-autopsy-report-ReportWizardAction.shadow">
-                <attr name="originalFile" stringvalue="Actions/Tools/org-sleuthkit-autopsy-report-ReportWizardAction.instance"/>
+            <!--<file name="org-sleuthkit-autopsy-report-infrastructure-ReportWizardAction.shadow">
+                <attr name="originalFile" stringvalue="Actions/Tools/org-sleuthkit-autopsy-report-infrastructure-ReportWizardAction.instance"/>
                 <attr name="position" intvalue="100"/>
             </file>-->
             <!--<file name="Separator1.instance_hidden"/>
@@ -311,29 +311,29 @@
             <attr name="instanceOf" stringvalue="org.sleuthkit.autopsy.directorytree.FileSearchProvider"/>
             <attr name="position" intvalue="250"/>
         </file>
-        <file name="org-sleuthkit-autopsy-report-ReportHTML.instance">
-            <attr name="instanceOf" stringvalue="org.sleuthkit.autopsy.report.TableReportModule"/>
-            <attr name="instanceCreate" methodvalue="org.sleuthkit.autopsy.report.ReportHTML.getDefault"/>
+        <file name="org-sleuthkit-autopsy-report-modules-ReportHTML.instance">
+            <attr name="instanceOf" stringvalue="org.sleuthkit.autopsy.report.infrastructure.TableReportModule"/>
+            <attr name="instanceCreate" methodvalue="org.sleuthkit.autopsy.report.modules.ReportHTML.getDefault"/>
             <attr name="position" intvalue="900"/>
         </file>
-        <file name="org-sleuthkit-autopsy-report-ReportExcel.instance">
-            <attr name="instanceOf" stringvalue="org.sleuthkit.autopsy.report.TableReportModule"/>
-            <attr name="instanceCreate" methodvalue="org.sleuthkit.autopsy.report.ReportExcel.getDefault"/>
+        <file name="org-sleuthkit-autopsy-report-modules-ReportExcel.instance">
+            <attr name="instanceOf" stringvalue="org.sleuthkit.autopsy.report.infrastructure.TableReportModule"/>
+            <attr name="instanceCreate" methodvalue="org.sleuthkit.autopsy.report.modules.ReportExcel.getDefault"/>
             <attr name="position" intvalue="901"/>
         </file>
-        <file name="org-sleuthkit-autopsy-report-ReportBodyFile.instance">
+        <file name="org-sleuthkit-autopsy-report-modules-ReportBodyFile.instance">
             <attr name="instanceOf" stringvalue="org.sleuthkit.autopsy.report.GeneralReportModule"/>
-            <attr name="instanceCreate" methodvalue="org.sleuthkit.autopsy.report.ReportBodyFile.getDefault"/>
+            <attr name="instanceCreate" methodvalue="org.sleuthkit.autopsy.report.modules.ReportBodyFile.getDefault"/>
             <attr name="position" intvalue="902"/>
         </file>
-        <file name="org-sleuthkit-autopsy-report-FileReportText.instance">
-            <attr name="instanceOf" stringvalue="org.sleuthkit.autopsy.report.FileReportModule"/>
-            <attr name="instanceCreate" methodvalue="org.sleuthkit.autopsy.report.FileReportText.getDefault"/>
+        <file name="org-sleuthkit-autopsy-report-modules-FileReportText.instance">
+            <attr name="instanceOf" stringvalue="org.sleuthkit.autopsy.report.infrastructure.FileReportModule"/>
+            <attr name="instanceCreate" methodvalue="org.sleuthkit.autopsy.report.modules.FileReportText.getDefault"/>
             <attr name="position" intvalue="903"/>
         </file>
-        <file name="org-sleuthkit-autopsy-report-ReportKML.instance">
+        <file name="org-sleuthkit-autopsy-report-modules-ReportKML.instance">
             <attr name="instanceOf" stringvalue="org.sleuthkit.autopsy.report.GeneralReportModule"/>
-            <attr name="instanceCreate" methodvalue="org.sleuthkit.autopsy.report.ReportKML.getDefault"/>
+            <attr name="instanceCreate" methodvalue="org.sleuthkit.autopsy.report.modules.ReportKML.getDefault"/>
             <attr name="position" intvalue="904"/>
         </file>
         <file name="org-sleuthkit-autopsy-modules-stix-STIXReportModule.instance">
@@ -391,9 +391,9 @@
                 <attr name="position" intvalue="10000"/>
             </file>
             <!--
-            <file name="org-sleuthkit-autopsy-report-ReportWizardAction.shadow">
-                <attr name="displayName" bundlevalue="org.sleuthkit.autopsy.report.Bundle#Toolbars/Reports/org-sleuthkit-autopsy-report-ReportWizardAction.shadow"/>
-                <attr name="originalFile" stringvalue="Actions/Tools/org-sleuthkit-autopsy-report-ReportWizardAction.instance"/>
+            <file name="org-sleuthkit-autopsy-report-infrastructure-ReportWizardAction.shadow">
+                <attr name="displayName" bundlevalue="org.sleuthkit.autopsy.report.Bundle#Toolbars/Reports/org-sleuthkit-autopsy-report-infrastructure-ReportWizardAction.shadow"/>
+                <attr name="originalFile" stringvalue="Actions/Tools/org-sleuthkit-autopsy-report-infrastructure-ReportWizardAction.instance"/>
                 <attr name="position" intvalue="103"/>
             </file>
             <file name="org-sleuthkit-autopsy-casemodule-CaseCloseAction.instance">
diff --git a/Core/src/org/sleuthkit/autopsy/report/Bundle.properties b/Core/src/org/sleuthkit/autopsy/report/Bundle.properties
index a1ea9222d5..2a296c830d 100644
--- a/Core/src/org/sleuthkit/autopsy/report/Bundle.properties
+++ b/Core/src/org/sleuthkit/autopsy/report/Bundle.properties
@@ -1,278 +1,4 @@
 OpenIDE-Module-Name=Report
-CTL_ReportWizardAction=Run Report
-ArtifactSelectionDialog.titleLabel.text=Select which result types you would like to report on:
-ArtifactSelectionDialog.okButton.text=OK
-ReportVisualPanel1.reportModulesLabel.text=Report Modules:
-ReportVisualPanel1.invalidModuleWarning=Encountered an invalid Report Module ({0})
 DefaultReportConfigurationPanel.infoLabel.text=This report will be configured on the next screen.
-ReportVisualPanel2.dataLabel.text=Select which data to report on:
-ReportVisualPanel2.deselectAllButton.text=Deselect All
-ReportVisualPanel2.selectAllButton.text=Select All
-ReportVisualPanel2.advancedButton.text=Result Types
-ArtifactSelectionDialog.deselectAllButton.text=Deselect All
-ArtifactSelectionDialog.selectAllButton.text=Select All
-ReportGenerationPanel.closeButton.text=Close
-ReportGenerationPanel.titleLabel.text=Report Generation Progress
-ReportVisualPanel2.allResultsRadioButton.text=All Results
-ReportWizardFileOptionsVisualPanel.selectAllButton.text=Select All
-ReportWizardFileOptionsVisualPanel.deselectAllButton.text=Deselect All
-ReportWizardFileOptionsVisualPanel.jLabel1.text=Select items to include in File Report:
-ArtifactSelectionDialog.dlgTitle.text=Result Type Selection
-FileReportDataTypes.filename.text=Name
-FileReportDataTypes.fileExt.text=File Extension
-FileReportDataTypes.fileType.text=File Type
-FileReportDataTypes.isDel.text=Is Deleted
-FileReportDataTypes.aTime.text=Last Accessed
-FileReportDataTypes.crTime.text=File Created
-FileReportDataTypes.mTime.text=Last Modified
-FileReportDataTypes.size.text=Size
-FileReportDataTypes.address.text=Address
-FileReportDataTypes.hash.text=Hash Value
-FileReportDataTypes.knownStatus.text=Known Status
-FileReportDataTypes.perms.text=Permissions
-FileReportDataTypes.path.text=Full Path
-FileReportText.getName.text=Files - Text
-FileReportText.getDesc.text=A delimited text file containing information about individual files in the case.
-ReportBodyFile.progress.querying=Querying files...
-ReportBodyFile.ingestWarning.text=Warning, this report was run before ingest services completed\!
-ReportBodyFile.progress.loading=Loading files...
-ReportBodyFile.progress.processing=Now processing {0}...
-ReportBodyFile.getName.text=TSK Body File
-ReportBodyFile.getDesc.text=Body file format report with MAC times for every file. This format can be used for a timeline view.
-ReportBodyFile.getFilePath.text=BodyFile.txt
-ReportKML.progress.querying=Querying files...
-ReportKML.progress.loading=Loading files...
-ReportKML.getName.text=Google Earth KML
-ReportKML.getDesc.text=KML format report with coordinates for relevant files. This format can be used for google earth views.
-ReportKML.getFilePath.text=ReportKML.kml
 ReportBranding.defaultReportTitle.text=Autopsy Forensic Report
-ReportBranding.defaultReportFooter.text=Powered by Autopsy Open Source Digital Forensics Platform - www.sleuthkit.org
-ReportExcel.numAartifacts.text=Number of artifacts:
-ReportExcel.getName.text=Excel Report
-ReportExcel.getDesc.text=A report about results and tagged items in Excel (XLS) format.
-ReportExcel.sheetName.text=Summary
-ReportExcel.cellVal.summary=Summary
-ReportExcel.cellVal.caseName=Case Name:
-ReportExcel.cellVal.caseNum=Case Number:
-ReportExcel.cellVal.examiner=Examiner:
-ReportExcel.cellVal.numImages=Number of Images:
-ReportGenerationPanel.confDlg.sureToClose.msg=Are you sure you'd like to close the dialog?\nAll reports will be canceled.
-ReportGenerationPanel.confDlg.title.closing=Closing
-ReportGenerationPanel.confDlg.cancelReport.msg=Are you sure you'd like to cancel the report?
-ReportGenerator.displayProgress.title.text=Report Generation Progress...
-ReportGenerator.progress.queryingDb.text=Querying database...
-ReportGenerator.progress.processingFile.text=Now processing {0}
-ReportGenerator.artifactTable.taggedResults.text=Contains results that were tagged with one of the following:
-ReportGenerator.progress.processing=Now processing {0}...
-ReportGenerator.msgShow.skippingArtType.title=Skipping artifact type {0} in reports
-ReportGenerator.msgShow.skippingArtType.msg=Unknown columns to report on
-ReportGenerator.makeContTagTab.taggedFiles.msg=Contains files that were tagged with one of the following:
-ReportGenerator.makeBbArtTagTab.taggedRes.msg=This report only includes results tagged with:
-ReportGenerator.tagTable.header.resultType=Result Type
-ReportGenerator.tagTable.header.tag=Tag
-ReportGenerator.tagTable.header.comment=Comment
-ReportGenerator.tagTable.header.srcFile=Source File
-ReportGenerator.progress.createdThumb.text=Creating thumbnails...
-ReportGenerator.htmlOutput.header.file=File
-ReportGenerator.htmlOutput.header.tag=Tag
-ReportGenerator.htmlOutput.header.comment=Comment
-ReportGenerator.htmlOutput.header.timeModified=Modified Time
-ReportGenerator.htmlOutput.header.timeChanged=Changed Time
-ReportGenerator.htmlOutput.header.timeAccessed=Accessed Time
-ReportGenerator.htmlOutput.header.timeCreated=Created Time
-ReportGenerator.htmlOutput.header.size=Size (Bytes)
-ReportGenerator.htmlOutput.header.hash=Hash
-ReportGenerator.thumbnailTable.name=Tagged Images
-ReportGenerator.thumbnailTable.desc=Contains thumbnails of images that are associated with tagged files and results.
-ReportGenerator.writeKwHits.userSrchs=User Searches
-ReportGenerator.progress.processingList=Now processing {0} ({1})...
-ReportGenerator.artTableColHdr.url=URL
-ReportGenerator.artTableColHdr.title=Title
-ReportGenerator.artTableColHdr.dateCreated=Date Created
-ReportGenerator.artTableColHdr.program=Program
-ReportGenerator.artTableColHdr.urlDomainDecoded=URL Domain
-ReportGenerator.artTableColHdr.srcFile=Source File
-ReportGenerator.artTableColHdr.dateTime=Date/Time
-ReportGenerator.artTableColHdr.name=Name
-ReportGenerator.artTableColHdr.value=Value
-ReportGenerator.artTableColHdr.dateAccessed=Date Accessed
-ReportGenerator.artTableColHdr.referrer=Referrer
-ReportGenerator.artTableColHdr.dest=Destination
-ReportGenerator.artTableColHdr.sourceUrl=Source URL
-ReportGenerator.artTableColHdr.path=Path
-ReportGenerator.artTableColHdr.progName=Program Name
-ReportGenerator.artTableColHdr.instDateTime=Install Date/Time
-ReportGenerator.artTableColHdr.preview=Preview
-ReportGenerator.artTableColHdr.file=File
-ReportGenerator.artTableColHdr.size=Size
-ReportGenerator.artTableColHdr.deviceId=Device ID
-ReportGenerator.artTableColHdr.text=Text
-ReportGenerator.artTableColHdr.domain=Domain
-ReportGenerator.artTableColHdr.dateTaken=Date Taken
-ReportGenerator.artTableColHdr.devManufacturer=Device Manufacturer
-ReportGenerator.artTableColHdr.devMake=Device Make
-ReportGenerator.artTableColHdr.devModel=Device Model
-ReportGenerator.artTableColHdr.latitude=Latitude
-ReportGenerator.artTableColHdr.longitude=Longitude
-ReportGenerator.artTableColHdr.latitudeStart=Starting Latitude
-ReportGenerator.artTableColHdr.longitudeStart=Starting Longitude
-ReportGenerator.artTableColHdr.latitudeEnd=Ending Latitude
-ReportGenerator.artTableColHdr.longitudeEnd=Ending Longitude
-ReportGenerator.artTableColHdr.associatedArtifact=Associated Artifact
-ReportGenerator.artTableColHdr.count=Count
-ReportGenerator.artTableColHdr.personName=Person Name
-ReportGenerator.artTableColHdr.phoneNumber=Phone Number
-ReportGenerator.artTableColHdr.phoneNumHome=Phone Number (Home)
-ReportGenerator.artTableColHdr.phoneNumOffice=Phone Number (Office)
-ReportGenerator.artTableColHdr.phoneNumMobile=Phone Number (Mobile)
-ReportGenerator.artTableColHdr.email=Email
-ReportGenerator.artTableColHdr.msgType=Message Type
-ReportGenerator.artTableColHdr.direction=Direction
-ReportGenerator.artTableColHdr.readStatus=Read Status
-ReportGenerator.artTableColHdr.fromPhoneNum=From Phone Number
-ReportGenerator.artTableColHdr.fromEmail=From Email
-ReportGenerator.artTableColHdr.toPhoneNum=To Phone Number
-ReportGenerator.artTableColHdr.toEmail=To Email
-ReportGenerator.artTableColHdr.subject=Subject
-ReportGenerator.artTableColHdr.tskEmailTo=E-Mail To
-ReportGenerator.artTableColHdr.tskEmailCc=E-Mail CC
-ReportGenerator.artTableColHdr.tskEmailBcc=E-Mail BCC
-ReportGenerator.artTableColHdr.tskEmailFrom=E-Mail From
-ReportGenerator.artTableColHdr.tskMsgId=Message ID
-ReportGenerator.artTableColHdr.tskDateTimeRcvd=Date Received
-ReportGenerator.artTableColHdr.tskDateTimeSent=Date Sent
-ReportGenerator.artTableColHdr.tskSubject=Subject
-ReportGenerator.artTableColHdr.tskSetName=Set Name
-ReportGenerator.artTableColHdr.tskInterestingFilesCategory=Rule
-ReportGenerator.artTableColHdr.tskGpsRouteCategory=Category
-ReportGenerator.artTableColHdr.tskPath=Path
-ReportGenerator.artTableColHdr.calendarEntryType=Calendar Entry Type
-ReportGenerator.artTableColHdr.description=Description
-ReportGenerator.artTableColHdr.startDateTime=Start Date/Time
-ReportGenerator.artTableColHdr.endDateTime=End Date/Time
-ReportGenerator.artTableColHdr.location=Location
-ReportGenerator.artTableColHdr.shortCut=Short Cut
-ReportGenerator.artTableColHdr.deviceName=Device Name
-ReportGenerator.artTableColHdr.deviceAddress=Device Address
-ReportGenerator.artTableColHdr.altitude=Altitude
-ReportGenerator.artTableColHdr.locationAddress=Location Address
-ReportGenerator.artTableColHdr.category=Category
-ReportGenerator.artTableColHdr.userId=User ID
-ReportGenerator.artTableColHdr.userName=User Name
-ReportGenerator.artTableColHdr.password=Password
-ReportGenerator.artTableColHdr.appName=App Name
-ReportGenerator.artTableColHdr.appPath=App Path
-ReportGenerator.artTableColHdr.replytoAddress=ReplyTo Address
-ReportGenerator.artTableColHdr.mailServer=Mail Server
-ReportGenerator.artTableColHdr.tags=Tags
-ReportGenerator.artTableColHdr.localPath=Local path
-ReportGenerator.artTableColHdr.remotePath=Remote path
-ReportGenerator.errors.reportErrorTitle=Error generating report
-ReportGenerator.errors.reportErrorText=Error generating report: 
-ReportHTML.addThumbRows.dataType.title=Tagged Images - {0}
-ReportHTML.addThumbRows.dataType.msg=Tagged Results and Contents that contain images.
-ReportHTML.thumbLink.tags=Tags:
-ReportHTML.getName.text=HTML Report
-ReportHTML.getDesc.text=A report about results and tagged items in HTML format.
-ReportHTML.writeIndex.title=for case {0}
-ReportHTML.writeIndex.noFrames.msg=Your browser is not compatible with our frame setup.
-ReportHTML.writeIndex.noFrames.seeNav=Please see <a href\="content\nav.html">the navigation page</a> for artifact links,
-ReportHTML.writeIndex.seeSum=and <a href\="content\summary.html">the summary page</a> for a case summary.
-ReportHTML.writeNav.title=Report Navigation
-ReportHTML.writeNav.h1=Report Navigation
-ReportHTML.writeNav.summary=Case Summary
-ReportHTML.writeSum.title=Case Summary
-ReportHTML.writeSum.warningMsg=<span>Warning, this report was run before ingest services completed\!</span>
-#
-# autopsy/test/scripts/regression.py._html_report_diff() uses reportGenOn.text, caseName, caseNum, 
-# examiner as a regex signature to skip report.html and summary.html
-#
-ReportHTML.writeSum.reportGenOn.text=HTML Report Generated on {0}
-ReportHTML.writeSum.imageInfoHeading=<h2>Image Information:</h2>
-ReportHTML.writeSum.softwareInfoHeading=<h2>Software Information:</h2>
-ReportHTML.writeSum.ingestHistoryHeading=<h2>Ingest History:</h2>
-ReportHTML.writeSum.modulesEnabledHeading=Enabled Modules:
-ReportHTML.writeSum.autopsyVersion=Autopsy Version:
-ReportHTML.writeSum.timezone=Timezone:
-ReportHTML.writeSum.path=Path:
-ReportProgressDialog.progress.queuing=Queuing...
-ReportProgressDialog.initPathLabel.noFile=<html><u>No report file</u></html>
-ReportProgressDialog.start.cancelButton.text=Cancel
-ReportProgressDialog.start.progress.text=Starting report...
-ReportProgressDialog.complete.processLbl.text=Complete
-ReportProgressDialog.complete.processLb2.text=Completed with error
-ReportProgressDialog.complete.cancelButton.text=Complete
-ReportProgressDialog.cancel.cancelButton.toolTipText=Canceled
-ReportProgressDialog.cancel.procLbl.text=Canceled
-ReportVisualPanel1.getName.text=Select and Configure Report Modules
-ReportVisualPanel2.getName.text=Configure Report
-ReportWizardAction.actionName.text=Generate Report
-ReportWizardAction.reportWiz.title=Generate Report
-ReportWizardAction.toolBarButton.text=Generate Report
-ReportWizardFileOptionsPanel.finishButton.text=Finish
-ReportWizardFileOptionsVisualPanel.getName.text=Configure File Report
-ReportWizardPanel1.nextButton.text=Next >
-ReportWizardPanel1.finishButton.text=Finish
-ReportWizardPanel2.finishButton.text=Finish
-ReportWizardPanel2.nextButton.text=Next >
-ReportBodyFile.generateReport.srcModuleName.text=TSK Body File
-ReportExcel.endReport.srcModuleName.text=Excel Report
-ReportHTML.writeIndex.srcModuleName.text=HTML Report
-ReportKML.genReport.srcModuleName.text=Geospatial Data
-ReportKML.genReport.reportName=KML Report
-ReportGenerator.artTableColHdr.extension.text=Extension
-ReportGenerator.artTableColHdr.mimeType.text=MIME Type
-ReportGenerator.artTableColHdr.processorArchitecture.text=Processor Architecture
-ReportGenerator.artTableColHdr.osName.text=Operating System Name
-ReportGenerator.artTableColHdr.osInstallDate.text=Install Date
-ReportGenerator.errList.failedMakeRptFolder=Failed to make report folder, may be unable to generate reports.
-ReportGenerator.notifyErr.errsDuringRptGen=Errors during report generation:
-ReportGenerator.errList.failedGetAllTagsArtifacts=Failed get all possible tag names and artifact types.
-ReportGenerator.errList.noReportSettings=Report settings have not been configured.
-ReportGenerator.errList.failedGetContentTags=Failed to get content tags.
-ReportGenerator.errList.failedGetBBArtifactTags=Failed to get blackboard artifact tags.
-ReportGenerator.errList.errGetContentFromBBArtifact=Error while getting content from a blackboard artifact to report on.
-ReportGenerator.errList.failedGetBBAttribs=Failed to get Blackboard Attributes when generating report.
-ReportGenerator.errList.failedGetBBArtifacts=Failed to get Blackboard Artifacts when generating report.
-ReportGenerator.errList.failedQueryKWLists=Failed to query keyword lists.
-ReportGenerator.errList.failedGetAbstractFileByID=Failed to get Abstract File by ID.
-ReportGenerator.errList.failedQueryKWs=Failed to query keywords.
-ReportGenerator.errList.failedQueryHashsetLists=Failed to query hashset lists.
-ReportGenerator.errList.failedGetAbstractFileFromID=Failed to get Abstract File from ID.
-ReportGenerator.errList.failedQueryHashsetHits=Failed to query hashsets hits.
-ReportGenerator.errList.coreExceptionWhileGenRptRow=Core exception while generating row data for artifact report.
-ReportKML.latLongStartPoint={0};{1};;{2} (Start)\n
-ReportKML.latLongEndPoint={0};{1};;{2} (End)\n
-ReportGenerationPanel.cancelButton.actionCommand=Cancel
-ReportGenerationPanel.cancelButton.text=Cancel
-ReportHTMLConfigurationPanel.headerTextField.text=
-ReportHTMLConfigurationPanel.footerTextField.text=
-ReportHTMLConfigurationPanel.headerLabel.text=Header:
-ReportHTMLConfigurationPanel.footerLabel.text=Footer:
-CreatePortableCasePanel.selectAllButton.text=Select All
-CreatePortableCasePanel.deselectAllButton.text=Deselect All
-CreatePortableCasePanel.outputFolderTextField.text=jTextField1
-CreatePortableCasePanel.chooseOutputFolderButton.text=Choose folder
-CreatePortableCasePanel.jLabel1.text=Export files tagged as:
-CreatePortableCasePanel.jLabel2.text=Select output folder:
-CreatePortableCasePanel.errorLabel.text_1=Windows only
-ReportWizardPortableCaseOptionsVisualPanel.errorLabel.text=Windows only
-ReportWizardPortableCaseOptionsVisualPanel.compressCheckbox.text=Package case into an archive:
-PortableCaseTagsListPanel.deselectButton.text=Deselect All
-PortableCaseTagsListPanel.selectButton.text=Select All
-PortableCaseInterestingItemsListPanel.selectButton.text=Select All
-PortableCaseInterestingItemsListPanel.deselectButton.text=Deselect All
-ReportFileTextConfigurationPanel.tabDelimitedButton.text=Tab delimited
-ReportFileTextConfigurationPanel.commaDelimitedButton.text=Comma delimited
-PortableCaseTagsListPanel.descLabel.text=Include the following tags:
-PortableCaseInterestingItemsListPanel.descLabel.text=Include Interesting Items from these sets:
-ReportWizardPortableCaseOptionsVisualPanel.compressCheckbox.toolTipText=
-ReportProgressDialog.separationLabel.text=:
-ReportProgressDialog.pathLabel.text=pathLabel
-ReportProgressDialog.reportLabel.text=reportLabel
-ReportProgressDialog.statusMessageLabel.text=processingLabel
-ReportVisualPanel2.specificTaggedResultsRadioButton.text=Specific Tagged Results
-ReportVisualPanel2.allTaggedResultsRadioButton.text=All Tagged Results
-ArtifactSelectionDialog.titleLabel.toolTipText=
-PortableCaseTagsListPanel.jAllTagsCheckBox.text=All Tagged Results
-PortableCaseInterestingItemsListPanel.jAllSetsCheckBox.text=All Interesting Items
+ReportBranding.defaultReportFooter.text=Powered by Autopsy Open Source Digital Forensics Platform - www.sleuthkit.org
\ No newline at end of file
diff --git a/Core/src/org/sleuthkit/autopsy/report/Bundle.properties-MERGED b/Core/src/org/sleuthkit/autopsy/report/Bundle.properties-MERGED
index 8b6676312d..2a296c830d 100755
--- a/Core/src/org/sleuthkit/autopsy/report/Bundle.properties-MERGED
+++ b/Core/src/org/sleuthkit/autopsy/report/Bundle.properties-MERGED
@@ -1,342 +1,4 @@
 OpenIDE-Module-Name=Report
-CTL_ReportWizardAction=Run Report
-ArtifactSelectionDialog.titleLabel.text=Select which result types you would like to report on:
-ArtifactSelectionDialog.okButton.text=OK
-PortableCaseInterestingItemsListPanel.error.errorLoadingTags=Error loading interesting item set names
-PortableCaseInterestingItemsListPanel.error.errorTitle=Error getting intesting item set names for case
-PortableCaseInterestingItemsListPanel.error.noOpenCase=There is no case open
-PortableCaseReportModule.compressCase.canceled=Compression canceled by user
-PortableCaseReportModule.compressCase.errorCompressingCase=Error compressing case
-# {0} - Temp folder path
-PortableCaseReportModule.compressCase.errorCreatingTempFolder=Could not create temporary folder {0}
-PortableCaseReportModule.compressCase.errorFinding7zip=Could not locate 7-Zip executable
-# {0} - File name
-PortableCaseReportModule.copyContentToPortableCase.copyingFile=Copying file {0}
-# {0} - case folder
-PortableCaseReportModule.createCase.caseDirExists=Case folder {0} already exists
-PortableCaseReportModule.createCase.errorCreatingCase=Error creating case
-# {0} - folder
-PortableCaseReportModule.createCase.errorCreatingFolder=Error creating folder {0}
-PortableCaseReportModule.createCase.errorStoringMaxIds=Error storing maximum database IDs
-PortableCaseReportModule.generateReport.caseClosed=Current case has been closed
-PortableCaseReportModule.generateReport.compressingCase=Compressing case...
-# {0} - tag name
-PortableCaseReportModule.generateReport.copyingArtifacts=Copying artifacts tagged as {0}...
-# {0} - tag name
-PortableCaseReportModule.generateReport.copyingFiles=Copying files tagged as {0}...
-PortableCaseReportModule.generateReport.copyingTags=Copying tags...
-PortableCaseReportModule.generateReport.creatingCase=Creating portable case database...
-PortableCaseReportModule.generateReport.errorCopyingArtifacts=Error copying tagged artifacts
-PortableCaseReportModule.generateReport.errorCopyingFiles=Error copying tagged files
-PortableCaseReportModule.generateReport.errorCopyingInterestingFiles=Error copying interesting files
-PortableCaseReportModule.generateReport.errorCopyingInterestingResults=Error copying interesting results
-PortableCaseReportModule.generateReport.errorCopyingTags=Error copying tags
-# {0} - attribute type name
-PortableCaseReportModule.generateReport.errorLookingUpAttrType=Error looking up attribute type {0}
-PortableCaseReportModule.generateReport.errorReadingSets=Error while reading interesting items sets from case database
-PortableCaseReportModule.generateReport.errorReadingTags=Error while reading tags from case database
-PortableCaseReportModule.generateReport.interestingItemError=Error loading intersting items
-PortableCaseReportModule.generateReport.noContentToCopy=No interesting files, results, or tagged items to copy
-# {0} - output folder
-PortableCaseReportModule.generateReport.outputDirDoesNotExist=Output folder {0} does not exist
-# {0} - output folder
-PortableCaseReportModule.generateReport.outputDirIsNotDir=Output folder {0} is not a folder
-PortableCaseReportModule.generateReport.verifying=Verifying selected parameters...
-PortableCaseReportModule.getDescription.description=Copies selected items to a new single-user case that can be easily shared
-PortableCaseReportModule.getName.name=Portable Case
-PortableCaseTagsListPanel.error.errorLoadingTags=Error loading tags
-PortableCaseTagsListPanel.error.errorTitle=Error getting tag names for case
-PortableCaseTagsListPanel.error.noOpenCase=There is no case open
-ReportExcel.exceptionMessage.dataTooLarge=Value is too long to fit into an Excel cell. 
-ReportExcel.exceptionMessage.errorText=Error showing data into an Excel cell.
-ReportExcel.writeSummary.caseName=Case Name:
-ReportExcel.writeSummary.caseNotes=Case Notes:
-ReportExcel.writeSummary.caseNum=Case Number:
-ReportExcel.writeSummary.examiner=Examiner:
-ReportExcel.writeSummary.numImages=Number of Images:
-ReportExcel.writeSummary.sheetName=Summary
-ReportExcel.writeSummary.summary=Summary
-ReportGenerator.artTableColHdr.comment=Comment
-ReportGenerator.errList.noOpenCase=No open case available.
-ReportGenerator.tagTable.header.userName=User Name
-ReportHTML.writeSum.case=Case:
-ReportHTML.writeSum.caseNotes=Notes:
-ReportHTML.writeSum.caseNumber=Case Number:
-ReportHTML.writeSum.caseNumImages=Number of Images:
-ReportHTML.writeSum.examiner=Examiner:
-ReportVisualPanel1.reportModulesLabel.text=Report Modules:
-ReportVisualPanel1.invalidModuleWarning=Encountered an invalid Report Module ({0})
 DefaultReportConfigurationPanel.infoLabel.text=This report will be configured on the next screen.
-ReportVisualPanel2.dataLabel.text=Select which data to report on:
-ReportVisualPanel2.deselectAllButton.text=Deselect All
-ReportVisualPanel2.selectAllButton.text=Select All
-ReportVisualPanel2.advancedButton.text=Result Types
-ArtifactSelectionDialog.deselectAllButton.text=Deselect All
-ArtifactSelectionDialog.selectAllButton.text=Select All
-ReportGenerationPanel.closeButton.text=Close
-ReportGenerationPanel.titleLabel.text=Report Generation Progress
-ReportVisualPanel2.allResultsRadioButton.text=All Results
-ReportWizardFileOptionsVisualPanel.selectAllButton.text=Select All
-ReportWizardFileOptionsVisualPanel.deselectAllButton.text=Deselect All
-ReportWizardFileOptionsVisualPanel.jLabel1.text=Select items to include in File Report:
-ArtifactSelectionDialog.dlgTitle.text=Result Type Selection
-FileReportDataTypes.filename.text=Name
-FileReportDataTypes.fileExt.text=File Extension
-FileReportDataTypes.fileType.text=File Type
-FileReportDataTypes.isDel.text=Is Deleted
-FileReportDataTypes.aTime.text=Last Accessed
-FileReportDataTypes.crTime.text=File Created
-FileReportDataTypes.mTime.text=Last Modified
-FileReportDataTypes.size.text=Size
-FileReportDataTypes.address.text=Address
-FileReportDataTypes.hash.text=Hash Value
-FileReportDataTypes.knownStatus.text=Known Status
-FileReportDataTypes.perms.text=Permissions
-FileReportDataTypes.path.text=Full Path
-FileReportText.getName.text=Files - Text
-FileReportText.getDesc.text=A delimited text file containing information about individual files in the case.
-ReportBodyFile.progress.querying=Querying files...
-ReportBodyFile.ingestWarning.text=Warning, this report was run before ingest services completed\!
-ReportBodyFile.progress.loading=Loading files...
-ReportBodyFile.progress.processing=Now processing {0}...
-ReportBodyFile.getName.text=TSK Body File
-ReportBodyFile.getDesc.text=Body file format report with MAC times for every file. This format can be used for a timeline view.
-ReportBodyFile.getFilePath.text=BodyFile.txt
-ReportKML.progress.querying=Querying files...
-ReportKML.progress.loading=Loading files...
-ReportKML.getName.text=Google Earth KML
-ReportKML.getDesc.text=KML format report with coordinates for relevant files. This format can be used for google earth views.
-ReportKML.getFilePath.text=ReportKML.kml
 ReportBranding.defaultReportTitle.text=Autopsy Forensic Report
-ReportBranding.defaultReportFooter.text=Powered by Autopsy Open Source Digital Forensics Platform - www.sleuthkit.org
-ReportExcel.numAartifacts.text=Number of artifacts:
-ReportExcel.getName.text=Excel Report
-ReportExcel.getDesc.text=A report about results and tagged items in Excel (XLS) format.
-ReportExcel.sheetName.text=Summary
-ReportExcel.cellVal.summary=Summary
-ReportExcel.cellVal.caseName=Case Name:
-ReportExcel.cellVal.caseNum=Case Number:
-ReportExcel.cellVal.examiner=Examiner:
-ReportExcel.cellVal.numImages=Number of Images:
-ReportGenerationPanel.confDlg.sureToClose.msg=Are you sure you'd like to close the dialog?\nAll reports will be canceled.
-ReportGenerationPanel.confDlg.title.closing=Closing
-ReportGenerationPanel.confDlg.cancelReport.msg=Are you sure you'd like to cancel the report?
-ReportGenerator.displayProgress.title.text=Report Generation Progress...
-ReportGenerator.progress.queryingDb.text=Querying database...
-ReportGenerator.progress.processingFile.text=Now processing {0}
-ReportGenerator.artifactTable.taggedResults.text=Contains results that were tagged with one of the following:
-ReportGenerator.progress.processing=Now processing {0}...
-ReportGenerator.msgShow.skippingArtType.title=Skipping artifact type {0} in reports
-ReportGenerator.msgShow.skippingArtType.msg=Unknown columns to report on
-ReportGenerator.makeContTagTab.taggedFiles.msg=Contains files that were tagged with one of the following:
-ReportGenerator.makeBbArtTagTab.taggedRes.msg=This report only includes results tagged with:
-ReportGenerator.tagTable.header.resultType=Result Type
-ReportGenerator.tagTable.header.tag=Tag
-ReportGenerator.tagTable.header.comment=Comment
-ReportGenerator.tagTable.header.srcFile=Source File
-ReportGenerator.progress.createdThumb.text=Creating thumbnails...
-ReportGenerator.htmlOutput.header.file=File
-ReportGenerator.htmlOutput.header.tag=Tag
-ReportGenerator.htmlOutput.header.comment=Comment
-ReportGenerator.htmlOutput.header.timeModified=Modified Time
-ReportGenerator.htmlOutput.header.timeChanged=Changed Time
-ReportGenerator.htmlOutput.header.timeAccessed=Accessed Time
-ReportGenerator.htmlOutput.header.timeCreated=Created Time
-ReportGenerator.htmlOutput.header.size=Size (Bytes)
-ReportGenerator.htmlOutput.header.hash=Hash
-ReportGenerator.thumbnailTable.name=Tagged Images
-ReportGenerator.thumbnailTable.desc=Contains thumbnails of images that are associated with tagged files and results.
-ReportGenerator.writeKwHits.userSrchs=User Searches
-ReportGenerator.progress.processingList=Now processing {0} ({1})...
-ReportGenerator.artTableColHdr.url=URL
-ReportGenerator.artTableColHdr.title=Title
-ReportGenerator.artTableColHdr.dateCreated=Date Created
-ReportGenerator.artTableColHdr.program=Program
-ReportGenerator.artTableColHdr.urlDomainDecoded=URL Domain
-ReportGenerator.artTableColHdr.srcFile=Source File
-ReportGenerator.artTableColHdr.dateTime=Date/Time
-ReportGenerator.artTableColHdr.name=Name
-ReportGenerator.artTableColHdr.value=Value
-ReportGenerator.artTableColHdr.dateAccessed=Date Accessed
-ReportGenerator.artTableColHdr.referrer=Referrer
-ReportGenerator.artTableColHdr.dest=Destination
-ReportGenerator.artTableColHdr.sourceUrl=Source URL
-ReportGenerator.artTableColHdr.path=Path
-ReportGenerator.artTableColHdr.progName=Program Name
-ReportGenerator.artTableColHdr.instDateTime=Install Date/Time
-ReportGenerator.artTableColHdr.preview=Preview
-ReportGenerator.artTableColHdr.file=File
-ReportGenerator.artTableColHdr.size=Size
-ReportGenerator.artTableColHdr.deviceId=Device ID
-ReportGenerator.artTableColHdr.text=Text
-ReportGenerator.artTableColHdr.domain=Domain
-ReportGenerator.artTableColHdr.dateTaken=Date Taken
-ReportGenerator.artTableColHdr.devManufacturer=Device Manufacturer
-ReportGenerator.artTableColHdr.devMake=Device Make
-ReportGenerator.artTableColHdr.devModel=Device Model
-ReportGenerator.artTableColHdr.latitude=Latitude
-ReportGenerator.artTableColHdr.longitude=Longitude
-ReportGenerator.artTableColHdr.latitudeStart=Starting Latitude
-ReportGenerator.artTableColHdr.longitudeStart=Starting Longitude
-ReportGenerator.artTableColHdr.latitudeEnd=Ending Latitude
-ReportGenerator.artTableColHdr.longitudeEnd=Ending Longitude
-ReportGenerator.artTableColHdr.associatedArtifact=Associated Artifact
-ReportGenerator.artTableColHdr.count=Count
-ReportGenerator.artTableColHdr.personName=Person Name
-ReportGenerator.artTableColHdr.phoneNumber=Phone Number
-ReportGenerator.artTableColHdr.phoneNumHome=Phone Number (Home)
-ReportGenerator.artTableColHdr.phoneNumOffice=Phone Number (Office)
-ReportGenerator.artTableColHdr.phoneNumMobile=Phone Number (Mobile)
-ReportGenerator.artTableColHdr.email=Email
-ReportGenerator.artTableColHdr.msgType=Message Type
-ReportGenerator.artTableColHdr.direction=Direction
-ReportGenerator.artTableColHdr.readStatus=Read Status
-ReportGenerator.artTableColHdr.fromPhoneNum=From Phone Number
-ReportGenerator.artTableColHdr.fromEmail=From Email
-ReportGenerator.artTableColHdr.toPhoneNum=To Phone Number
-ReportGenerator.artTableColHdr.toEmail=To Email
-ReportGenerator.artTableColHdr.subject=Subject
-ReportGenerator.artTableColHdr.tskEmailTo=E-Mail To
-ReportGenerator.artTableColHdr.tskEmailCc=E-Mail CC
-ReportGenerator.artTableColHdr.tskEmailBcc=E-Mail BCC
-ReportGenerator.artTableColHdr.tskEmailFrom=E-Mail From
-ReportGenerator.artTableColHdr.tskMsgId=Message ID
-ReportGenerator.artTableColHdr.tskDateTimeRcvd=Date Received
-ReportGenerator.artTableColHdr.tskDateTimeSent=Date Sent
-ReportGenerator.artTableColHdr.tskSubject=Subject
-ReportGenerator.artTableColHdr.tskSetName=Set Name
-ReportGenerator.artTableColHdr.tskInterestingFilesCategory=Rule
-ReportGenerator.artTableColHdr.tskGpsRouteCategory=Category
-ReportGenerator.artTableColHdr.tskPath=Path
-ReportGenerator.artTableColHdr.calendarEntryType=Calendar Entry Type
-ReportGenerator.artTableColHdr.description=Description
-ReportGenerator.artTableColHdr.startDateTime=Start Date/Time
-ReportGenerator.artTableColHdr.endDateTime=End Date/Time
-ReportGenerator.artTableColHdr.location=Location
-ReportGenerator.artTableColHdr.shortCut=Short Cut
-ReportGenerator.artTableColHdr.deviceName=Device Name
-ReportGenerator.artTableColHdr.deviceAddress=Device Address
-ReportGenerator.artTableColHdr.altitude=Altitude
-ReportGenerator.artTableColHdr.locationAddress=Location Address
-ReportGenerator.artTableColHdr.category=Category
-ReportGenerator.artTableColHdr.userId=User ID
-ReportGenerator.artTableColHdr.userName=User Name
-ReportGenerator.artTableColHdr.password=Password
-ReportGenerator.artTableColHdr.appName=App Name
-ReportGenerator.artTableColHdr.appPath=App Path
-ReportGenerator.artTableColHdr.replytoAddress=ReplyTo Address
-ReportGenerator.artTableColHdr.mailServer=Mail Server
-ReportGenerator.artTableColHdr.tags=Tags
-ReportGenerator.artTableColHdr.localPath=Local path
-ReportGenerator.artTableColHdr.remotePath=Remote path
-ReportGenerator.errors.reportErrorTitle=Error generating report
-ReportGenerator.errors.reportErrorText=Error generating report: 
-ReportHTML.addThumbRows.dataType.title=Tagged Images - {0}
-ReportHTML.addThumbRows.dataType.msg=Tagged Results and Contents that contain images.
-ReportHTML.thumbLink.tags=Tags:
-ReportHTML.getName.text=HTML Report
-ReportHTML.getDesc.text=A report about results and tagged items in HTML format.
-ReportHTML.writeIndex.title=for case {0}
-ReportHTML.writeIndex.noFrames.msg=Your browser is not compatible with our frame setup.
-ReportHTML.writeIndex.noFrames.seeNav=Please see <a href\="content\nav.html">the navigation page</a> for artifact links,
-ReportHTML.writeIndex.seeSum=and <a href\="content\summary.html">the summary page</a> for a case summary.
-ReportHTML.writeNav.title=Report Navigation
-ReportHTML.writeNav.h1=Report Navigation
-ReportHTML.writeNav.summary=Case Summary
-ReportHTML.writeSum.title=Case Summary
-ReportHTML.writeSum.warningMsg=<span>Warning, this report was run before ingest services completed\!</span>
-#
-# autopsy/test/scripts/regression.py._html_report_diff() uses reportGenOn.text, caseName, caseNum, 
-# examiner as a regex signature to skip report.html and summary.html
-#
-ReportHTML.writeSum.reportGenOn.text=HTML Report Generated on {0}
-ReportHTML.writeSum.imageInfoHeading=<h2>Image Information:</h2>
-ReportHTML.writeSum.softwareInfoHeading=<h2>Software Information:</h2>
-ReportHTML.writeSum.ingestHistoryHeading=<h2>Ingest History:</h2>
-ReportHTML.writeSum.modulesEnabledHeading=Enabled Modules:
-ReportHTML.writeSum.autopsyVersion=Autopsy Version:
-ReportHTML.writeSum.timezone=Timezone:
-ReportHTML.writeSum.path=Path:
-ReportProgressDialog.progress.queuing=Queuing...
-ReportProgressDialog.initPathLabel.noFile=<html><u>No report file</u></html>
-ReportProgressDialog.start.cancelButton.text=Cancel
-ReportProgressDialog.start.progress.text=Starting report...
-ReportProgressDialog.complete.processLbl.text=Complete
-ReportProgressDialog.complete.processLb2.text=Completed with error
-ReportProgressDialog.complete.cancelButton.text=Complete
-ReportProgressDialog.cancel.cancelButton.toolTipText=Canceled
-ReportProgressDialog.cancel.procLbl.text=Canceled
-ReportVisualPanel1.getName.text=Select and Configure Report Modules
-ReportVisualPanel2.getName.text=Configure Report
-ReportWizardAction.actionName.text=Generate Report
-ReportWizardAction.reportWiz.title=Generate Report
-ReportWizardAction.toolBarButton.text=Generate Report
-ReportWizardFileOptionsPanel.finishButton.text=Finish
-ReportWizardFileOptionsVisualPanel.getName.text=Configure File Report
-ReportWizardPanel1.nextButton.text=Next >
-ReportWizardPanel1.finishButton.text=Finish
-ReportWizardPanel2.finishButton.text=Finish
-ReportWizardPanel2.nextButton.text=Next >
-ReportBodyFile.generateReport.srcModuleName.text=TSK Body File
-ReportExcel.endReport.srcModuleName.text=Excel Report
-ReportHTML.writeIndex.srcModuleName.text=HTML Report
-ReportKML.genReport.srcModuleName.text=Geospatial Data
-ReportKML.genReport.reportName=KML Report
-ReportGenerator.artTableColHdr.extension.text=Extension
-ReportGenerator.artTableColHdr.mimeType.text=MIME Type
-ReportGenerator.artTableColHdr.processorArchitecture.text=Processor Architecture
-ReportGenerator.artTableColHdr.osName.text=Operating System Name
-ReportGenerator.artTableColHdr.osInstallDate.text=Install Date
-ReportGenerator.errList.failedMakeRptFolder=Failed to make report folder, may be unable to generate reports.
-ReportGenerator.notifyErr.errsDuringRptGen=Errors during report generation:
-ReportGenerator.errList.failedGetAllTagsArtifacts=Failed get all possible tag names and artifact types.
-ReportGenerator.errList.noReportSettings=Report settings have not been configured.
-ReportGenerator.errList.failedGetContentTags=Failed to get content tags.
-ReportGenerator.errList.failedGetBBArtifactTags=Failed to get blackboard artifact tags.
-ReportGenerator.errList.errGetContentFromBBArtifact=Error while getting content from a blackboard artifact to report on.
-ReportGenerator.errList.failedGetBBAttribs=Failed to get Blackboard Attributes when generating report.
-ReportGenerator.errList.failedGetBBArtifacts=Failed to get Blackboard Artifacts when generating report.
-ReportGenerator.errList.failedQueryKWLists=Failed to query keyword lists.
-ReportGenerator.errList.failedGetAbstractFileByID=Failed to get Abstract File by ID.
-ReportGenerator.errList.failedQueryKWs=Failed to query keywords.
-ReportGenerator.errList.failedQueryHashsetLists=Failed to query hashset lists.
-ReportGenerator.errList.failedGetAbstractFileFromID=Failed to get Abstract File from ID.
-ReportGenerator.errList.failedQueryHashsetHits=Failed to query hashsets hits.
-ReportGenerator.errList.coreExceptionWhileGenRptRow=Core exception while generating row data for artifact report.
-ReportKML.latLongStartPoint={0};{1};;{2} (Start)\n
-ReportKML.latLongEndPoint={0};{1};;{2} (End)\n
-ReportGenerationPanel.cancelButton.actionCommand=Cancel
-ReportGenerationPanel.cancelButton.text=Cancel
-ReportHTMLConfigurationPanel.headerTextField.text=
-ReportHTMLConfigurationPanel.footerTextField.text=
-ReportHTMLConfigurationPanel.headerLabel.text=Header:
-ReportHTMLConfigurationPanel.footerLabel.text=Footer:
-CreatePortableCasePanel.selectAllButton.text=Select All
-CreatePortableCasePanel.deselectAllButton.text=Deselect All
-CreatePortableCasePanel.outputFolderTextField.text=jTextField1
-CreatePortableCasePanel.chooseOutputFolderButton.text=Choose folder
-CreatePortableCasePanel.jLabel1.text=Export files tagged as:
-CreatePortableCasePanel.jLabel2.text=Select output folder:
-CreatePortableCasePanel.errorLabel.text_1=Windows only
-ReportWizardPortableCaseOptionsVisualPanel.errorLabel.text=Windows only
-ReportWizardPortableCaseOptionsVisualPanel.compressCheckbox.text=Package case into an archive:
-PortableCaseTagsListPanel.deselectButton.text=Deselect All
-PortableCaseTagsListPanel.selectButton.text=Select All
-PortableCaseInterestingItemsListPanel.selectButton.text=Select All
-PortableCaseInterestingItemsListPanel.deselectButton.text=Deselect All
-ReportFileTextConfigurationPanel.tabDelimitedButton.text=Tab delimited
-ReportFileTextConfigurationPanel.commaDelimitedButton.text=Comma delimited
-PortableCaseTagsListPanel.descLabel.text=Include the following tags:
-PortableCaseInterestingItemsListPanel.descLabel.text=Include Interesting Items from these sets:
-ReportWizardPortableCaseOptionsVisualPanel.compressCheckbox.toolTipText=
-ReportProgressDialog.separationLabel.text=:
-ReportProgressDialog.pathLabel.text=pathLabel
-ReportProgressDialog.reportLabel.text=reportLabel
-ReportProgressDialog.statusMessageLabel.text=processingLabel
-ReportVisualPanel2.specificTaggedResultsRadioButton.text=Specific Tagged Results
-ReportVisualPanel2.allTaggedResultsRadioButton.text=All Tagged Results
-ArtifactSelectionDialog.titleLabel.toolTipText=
-PortableCaseTagsListPanel.jAllTagsCheckBox.text=All Tagged Results
-PortableCaseInterestingItemsListPanel.jAllSetsCheckBox.text=All Interesting Items
-ReportWizardPortableCaseOptionsVisualPanel.getName.title=Choose Portable Case settings
-TableReportGenerator.StatusColumn.Header=Review Status
+ReportBranding.defaultReportFooter.text=Powered by Autopsy Open Source Digital Forensics Platform - www.sleuthkit.org
\ No newline at end of file
diff --git a/Core/src/org/sleuthkit/autopsy/report/Bundle_ja.properties b/Core/src/org/sleuthkit/autopsy/report/Bundle_ja.properties
index e64fe2a502..3e5659464f 100644
--- a/Core/src/org/sleuthkit/autopsy/report/Bundle_ja.properties
+++ b/Core/src/org/sleuthkit/autopsy/report/Bundle_ja.properties
@@ -1,245 +1,4 @@
 OpenIDE-Module-Name=\u30ec\u30dd\u30fc\u30c8
-CTL_ReportWizardAction=\u30ec\u30dd\u30fc\u30c8\u3092\u5b9f\u884c
-ArtifactSelectionDialog.titleLabel.text=\u3069\u306e\u30a2\u30fc\u30c6\u30a3\u30d5\u30a1\u30af\u30c8\u306b\u3064\u3044\u3066\u30ec\u30dd\u30fc\u30c8\u3059\u308b\u304b\u9078\u629e\u3057\u3066\u4e0b\u3055\u3044\uff1a
-ArtifactSelectionDialog.okButton.text=OK
-ReportVisualPanel1.reportModulesLabel.text=\u30ec\u30dd\u30fc\u30c8\u30e2\u30b8\u30e5\u30fc\u30eb\uff1a
 DefaultReportConfigurationPanel.infoLabel.text=\u3053\u306e\u30ec\u30dd\u30fc\u30c8\u306f\u6b21\u306e\u30b9\u30af\u30ea\u30fc\u30f3\u3067\u8a2d\u5b9a\u3055\u308c\u307e\u3059\u3002
-ReportVisualPanel2.dataLabel.text=\u3069\u306e\u30c7\u30fc\u30bf\u306b\u3064\u3044\u3066\u30ec\u30dd\u30fc\u30c8\u3059\u308b\u304b\u9078\u629e\u3057\u3066\u4e0b\u3055\u3044\uff1a
-ReportVisualPanel2.deselectAllButton.text=\u5168\u3066\u9078\u629e\u89e3\u9664
-ReportVisualPanel2.selectAllButton.text=\u5168\u3066\u9078\u629e
-ReportVisualPanel2.advancedButton.text=\u30c7\u30fc\u30bf\u30bf\u30a4\u30d7
-ArtifactSelectionDialog.deselectAllButton.text=\u5168\u3066\u9078\u629e\u89e3\u9664
-ArtifactSelectionDialog.selectAllButton.text=\u5168\u3066\u9078\u629e
-ReportGenerationPanel.closeButton.text=\u9589\u3058\u308b
-ReportGenerationPanel.titleLabel.text=\u30ec\u30dd\u30fc\u30c8\u751f\u6210\u30d7\u30ed\u30b0\u30ec\u30b9
-ReportVisualPanel2.allResultsRadioButton.text=\u5168\u3066\u306e\u7d50\u679c
-ReportWizardFileOptionsVisualPanel.selectAllButton.text=\u5168\u3066\u9078\u629e
-ReportWizardFileOptionsVisualPanel.deselectAllButton.text=\u5168\u3066\u9078\u629e\u89e3\u9664
-ReportWizardFileOptionsVisualPanel.jLabel1.text=\u30d5\u30a1\u30a4\u30eb\u30ec\u30dd\u30fc\u30c8\u306b\u542b\u3081\u308b\u30a2\u30a4\u30c6\u30e0\u3092\u9078\u629e\u3057\u3066\u4e0b\u3055\u3044\uff1a
-ArtifactSelectionDialog.dlgTitle.text=\u30a2\u30c9\u30d0\u30f3\u30b9\u30a2\u30fc\u30c6\u30a3\u30d5\u30a1\u30af\u30c8\u9078\u629e
-FileReportDataTypes.filename.text=\u540d\u524d
-FileReportDataTypes.fileExt.text=\u30d5\u30a1\u30a4\u30eb\u62e1\u5f35\u5b50
-FileReportDataTypes.fileType.text=\u30d5\u30a1\u30a4\u30eb\u30bf\u30a4\u30d7
-FileReportDataTypes.isDel.text=\u306f\u524a\u9664\u3055\u308c\u307e\u3057\u305f
-FileReportDataTypes.aTime.text=\u6700\u5f8c\u306e\u30a2\u30af\u30bb\u30b9
-FileReportDataTypes.crTime.text=\u4f5c\u6210\u3055\u308c\u305f\u30d5\u30a1\u30a4\u30eb
-FileReportDataTypes.mTime.text=\u6700\u5f8c\u306e\u4fee\u6b63
-FileReportDataTypes.size.text=\u30b5\u30a4\u30ba
-FileReportDataTypes.address.text=\u30a2\u30c9\u30ec\u30b9
-FileReportDataTypes.hash.text=\u30cf\u30c3\u30b7\u30e5\u5024
-FileReportDataTypes.knownStatus.text=\u65e2\u77e5\u30b9\u30c6\u30fc\u30bf\u30b9
-FileReportDataTypes.perms.text=\u30d1\u30fc\u30df\u30c3\u30b7\u30e7\u30f3
-FileReportDataTypes.path.text=\u30d5\u30eb\u30d1\u30b9
-FileReportText.getName.text=\u30d5\u30a1\u30a4\u30eb - \u30c6\u30ad\u30b9\u30c8
-FileReportText.getDesc.text=\u30b1\u30fc\u30b9\u306e\u500b\u5225\u30d5\u30a1\u30a4\u30eb\u306b\u3064\u3044\u3066\u306e\u60c5\u5831\u3092\u6301\u3064\u3001\u30bf\u30d6\u533a\u5207\u308a\u30c6\u30ad\u30b9\u30c8\u30d5\u30a1\u30a4\u30eb\u3002
-ReportBodyFile.progress.querying=\u30d5\u30a1\u30a4\u30eb\u306e\u30af\u30a8\u30ea\u3092\u5b9f\u884c\u4e2d\u2026
-ReportBodyFile.ingestWarning.text=\u8b66\u544a\u3001\u30a4\u30f3\u30b8\u30a7\u30b9\u30c8\u30b5\u30fc\u30d3\u30b9\u304c\u5b8c\u4e86\u3059\u308b\u524d\u306b\u30ec\u30dd\u30fc\u30c8\u304c\u5b9f\u884c\u3055\u308c\u307e\u3057\u305f\uff01
-ReportBodyFile.progress.loading=\u30d5\u30a1\u30a4\u30eb\u306e\u8aad\u307f\u8fbc\u307f\u4e2d\u2026
-ReportBodyFile.progress.processing={0}\u3092\u51e6\u7406\u4e2d\u2026
-ReportBodyFile.getName.text=TSK\u30dc\u30c7\u30a3\u30d5\u30a1\u30a4\u30eb
-ReportBodyFile.getDesc.text=\u5404\u30d5\u30a1\u30a4\u30eb\u306eMAC\u30bf\u30a4\u30e0\u3092\u542b\u3080\u3001\u30dc\u30c7\u30a3\u30d5\u30a1\u30a4\u30eb\u5f62\u5f0f\u30ec\u30dd\u30fc\u30c8\u3002\u30bf\u30a4\u30e0\u30e9\u30a4\u30f3\u30d3\u30e5\u30fc\u306b\u3053\u306e\u5f62\u5f0f\u3092\u4f7f\u7528\u3067\u304d\u307e\u3059\u3002
-ReportBodyFile.getFilePath.text=BodyFile.txt
 ReportBranding.defaultReportTitle.text=Autopsy\u30d5\u30a9\u30ec\u30f3\u30b8\u30c3\u30af\u30ec\u30dd\u30fc\u30c8
 ReportBranding.defaultReportFooter.text=Autopsy\u30aa\u30fc\u30d7\u30f3\u30bd\u30fc\u30b9\u30fb\u30c7\u30b8\u30bf\u30eb\u30fb\u30d5\u30a9\u30ec\u30f3\u30b8\u30c3\u30af\u30fb\u30d7\u30e9\u30c3\u30c8\u30d5\u30a9\u30fc\u30e0\u306b\u3088\u308a\u63d0\u4f9b - www.sleuthkit.org
-ReportExcel.numAartifacts.text=\u30a2\u30fc\u30c6\u30a3\u30d5\u30a1\u30af\u30c8\u6570\uff1a
-ReportExcel.getName.text=\u7d50\u679c - Excel
-ReportExcel.getDesc.text=\u7d50\u679c\u306b\u95a2\u3059\u308b\u30ec\u30dd\u30fc\u30c8\u3002Excel(XLS)\u30d5\u30a9\u30fc\u30de\u30c3\u30c8\u3067\u30a2\u30a4\u30c6\u30e0\u306e\u30bf\u30b0\u4ed8\u3051\u304c\u3055\u308c\u3066\u3044\u307e\u3059\u3002
-ReportExcel.sheetName.text=\u30b5\u30de\u30ea\u30fc
-ReportExcel.cellVal.summary=\u30b5\u30de\u30ea\u30fc
-ReportExcel.cellVal.caseName=\u30b1\u30fc\u30b9\u540d\uff1a
-ReportExcel.cellVal.caseNum=\u30b1\u30fc\u30b9\u756a\u53f7\uff1a
-ReportExcel.cellVal.examiner=\u8abf\u67fb\u62c5\u5f53\u8005\uff1a
-ReportExcel.cellVal.numImages=\u30a4\u30e1\u30fc\u30b8\u6570\uff1a
-ReportGenerationPanel.confDlg.sureToClose.msg=\u3053\u306e\u30c0\u30a4\u30a2\u30ed\u30b0\u3092\u672c\u5f53\u306b\u9589\u3058\u307e\u3059\u304b\uff1f\n\u5168\u3066\u306e\u30ec\u30dd\u30fc\u30c8\u304c\u30ad\u30e3\u30f3\u30bb\u30eb\u3055\u308c\u307e\u3059\u3002
-ReportGenerationPanel.confDlg.title.closing=\u9589\u3058\u3066\u3044\u307e\u3059
-ReportGenerator.displayProgress.title.text=\u30ec\u30dd\u30fc\u30c8\u751f\u6210\u30d7\u30ed\u30b0\u30ec\u30b9\u2026
-ReportGenerator.progress.queryingDb.text=\u30c7\u30fc\u30bf\u30d9\u30fc\u30b9\u306e\u30af\u30a8\u30ea\u3092\u5b9f\u884c\u4e2d\u2026
-ReportGenerator.progress.processingFile.text={0}\u3092\u51e6\u7406\u4e2d
-ReportGenerator.artifactTable.taggedResults.text=\u6b21\u306e\u4e2d\u306e\u4e00\u3064\u3067\u30bf\u30b0\u3055\u308c\u305f\u7d50\u679c\u304c\u542b\u307e\u308c\u3066\u3044\u307e\u3059\uff1a
-ReportGenerator.progress.processing={0}\u3092\u51e6\u7406\u4e2d\u2026
-ReportGenerator.msgShow.skippingArtType.title=\u30a2\u30fc\u30c6\u30a3\u30d5\u30a1\u30af\u30c8\u30bf\u30a4\u30d7{0}\u3092\u30ec\u30dd\u30fc\u30c8\u3067\u30b9\u30ad\u30c3\u30d7\u3057\u3066\u3044\u307e\u3059
-ReportGenerator.msgShow.skippingArtType.msg=\u30ec\u30dd\u30fc\u30c8\u751f\u6210\u3059\u308b\u306e\u306b\u4e0d\u660e\u306a\u30b3\u30e9\u30e0
-ReportGenerator.msgShow.skippingArtRow.title=\u30bf\u30a4\u30d7{0}\u306e\u30a2\u30fc\u30c6\u30a3\u30d5\u30a1\u30af\u30c8\u884c\u3092\u30ec\u30dd\u30fc\u30c8\u3067\u30b9\u30ad\u30c3\u30d7\u3057\u3066\u3044\u307e\u3059
-ReportGenerator.msgShow.skippingArtRow.msg=\u30ec\u30dd\u30fc\u30c8\u751f\u6210\u3059\u308b\u306e\u306b\u4e0d\u660e\u306a\u30b3\u30e9\u30e0
-ReportGenerator.makeContTagTab.taggedFiles.msg=\u306e\u4e2d\u306e\u4e00\u3064\u3067\u30bf\u30b0\u3055\u308c\u305f\u7d50\u679c\u304c\u542b\u307e\u308c\u3066\u3044\u307e\u3059\uff1a
-ReportGenerator.makeBbArtTagTab.taggedRes.msg=\u3053\u306e\u30ec\u30dd\u30fc\u30c8\u306b\u306f\u6b21\u3067\u30bf\u30b0\u3055\u308c\u305f\u7d50\u679c\u3057\u304b\u542b\u307e\u308c\u307e\u305b\u3093\uff1a
-ReportGenerator.tagTable.header.resultType=\u7d50\u679c\u30bf\u30a4\u30d7
-ReportGenerator.tagTable.header.tag=\u30bf\u30b0
-ReportGenerator.tagTable.header.comment=\u30b3\u30e1\u30f3\u30c8
-ReportGenerator.tagTable.header.srcFile=\u30bd\u30fc\u30b9\u30d5\u30a1\u30a4\u30eb
-ReportGenerator.progress.createdThumb.text=\u30b5\u30e0\u30cd\u30a4\u30eb\u3092\u4f5c\u6210\u4e2d\u2026
-ReportGenerator.thumbnailTable.name=\u30b5\u30e0\u30cd\u30a4\u30eb
-ReportGenerator.thumbnailTable.desc=\u30bf\u30b0\u3055\u308c\u305f\u30d5\u30a1\u30a4\u30eb\u3084\u7d50\u679c\u306b\u95a2\u9023\u3059\u308b\u30a4\u30e1\u30fc\u30b8\u306e\u30b5\u30e0\u30cd\u30a4\u30eb\u304c\u542b\u307e\u308c\u307e\u3059\u3002
-ReportGenerator.writeKwHits.userSrchs=\u30e6\u30fc\u30b6\u691c\u7d22
-ReportGenerator.progress.processingList={0} ({1})\u3092\u51e6\u7406\u4e2d\u2026
-ReportGenerator.artTableColHdr.url=URL
-ReportGenerator.artTableColHdr.title=\u30bf\u30a4\u30c8\u30eb
-ReportGenerator.artTableColHdr.dateCreated=\u4f5c\u6210\u65e5\u4ed8
-ReportGenerator.artTableColHdr.program=\u30d7\u30ed\u30b0\u30e9\u30e0
-ReportGenerator.artTableColHdr.srcFile=\u30bd\u30fc\u30b9\u30d5\u30a1\u30a4\u30eb
-ReportGenerator.artTableColHdr.dateTime=\u65e5\u4ed8\uff0f\u6642\u523b
-ReportGenerator.artTableColHdr.name=\u540d\u524d
-ReportGenerator.artTableColHdr.value=\u30d0\u30ea\u30e5\u30fc
-ReportGenerator.artTableColHdr.dateAccessed=\u30a2\u30af\u30bb\u30b9\u65e5\u4ed8
-ReportGenerator.artTableColHdr.referrer=\u30ea\u30d5\u30a1\u30e9
-ReportGenerator.artTableColHdr.dest=\u30c7\u30b9\u30c6\u30a3\u30cd\u30fc\u30b7\u30e7\u30f3
-ReportGenerator.artTableColHdr.sourceUrl=\u30bd\u30fc\u30b9URL
-ReportGenerator.artTableColHdr.path=\u30d1\u30b9
-ReportGenerator.artTableColHdr.progName=\u30d7\u30ed\u30b0\u30e9\u30e0\u540d
-ReportGenerator.artTableColHdr.instDateTime=\u30a4\u30f3\u30b9\u30c8\u30fc\u30eb\u65e5\u4ed8\uff0f\u6642\u523b
-ReportGenerator.artTableColHdr.preview=\u30d7\u30ec\u30d3\u30e5\u30fc
-ReportGenerator.artTableColHdr.file=\u30d5\u30a1\u30a4\u30eb
-ReportGenerator.artTableColHdr.size=\u30b5\u30a4\u30ba
-ReportGenerator.artTableColHdr.deviceId=\u6a5f\u5668ID
-ReportGenerator.artTableColHdr.text=\u30c6\u30ad\u30b9\u30c8
-ReportGenerator.artTableColHdr.domain=\u30c9\u30e1\u30a4\u30f3
-ReportGenerator.artTableColHdr.devManufacturer=\u6a5f\u5668\u30e1\u30fc\u30ab\u30fc
-ReportGenerator.artTableColHdr.devModel=\u6a5f\u5668\u30e2\u30c7\u30eb
-ReportGenerator.artTableColHdr.personName=\u4eba\u540d
-ReportGenerator.artTableColHdr.phoneNumber=\u96fb\u8a71\u756a\u53f7
-ReportGenerator.artTableColHdr.phoneNumHome=\u96fb\u8a71\u756a\u53f7\uff08\u81ea\u5b85\uff09
-ReportGenerator.artTableColHdr.phoneNumOffice=\u96fb\u8a71\u756a\u53f7\uff08\u4f1a\u793e\uff09
-ReportGenerator.artTableColHdr.phoneNumMobile=\u96fb\u8a71\u756a\u53f7\uff08\u643a\u5e2f\uff09
-ReportGenerator.artTableColHdr.email=Email
-ReportGenerator.artTableColHdr.msgType=\u30e1\u30c3\u30bb\u30fc\u30b8\u30bf\u30a4\u30d7
-ReportGenerator.artTableColHdr.latitude=\u7def\u5ea6
-ReportGenerator.artTableColHdr.longitude=\u7d4c\u5ea6
-ReportGenerator.artTableColHdr.dateTaken=\u64ae\u5f71\u65e5\u4ed8
-ReportGenerator.artTableColHdr.subject=\u30b5\u30d6\u30b8\u30a7\u30af\u30c8
-ReportGenerator.artTableColHdr.calendarEntryType=\u30ab\u30ec\u30f3\u30c0\u30fc\u30a8\u30f3\u30c8\u30ea\u30bf\u30a4\u30d7
-ReportGenerator.artTableColHdr.description=\u8aac\u660e
-ReportGenerator.artTableColHdr.startDateTime=\u958b\u59cb\u65e5\u4ed8\uff0f\u6642\u523b
-ReportGenerator.artTableColHdr.shortCut=\u30b7\u30e7\u30fc\u30c8\u30ab\u30c3\u30c8
-ReportGenerator.artTableColHdr.endDateTime=\u4fee\u4e86\u65e5\u4ed8\uff0f\u6642\u523b
-ReportGenerator.artTableColHdr.location=\u30ed\u30b1\u30fc\u30b7\u30e7\u30f3
-ReportGenerator.artTableColHdr.deviceName=\u6a5f\u5668\u540d
-ReportGenerator.artTableColHdr.deviceAddress=\u6a5f\u5668\u30a2\u30c9\u30ec\u30b9
-ReportGenerator.artTableColHdr.altitude=\u6a19\u9ad8
-ReportGenerator.artTableColHdr.locationAddress=\u30ed\u30b1\u30fc\u30b7\u30e7\u30f3\u30a2\u30c9\u30ec\u30b9
-ReportGenerator.artTableColHdr.category=\u30ab\u30c6\u30b4\u30ea\u30fc
-ReportGenerator.artTableColHdr.userId=\u30e6\u30fc\u30b6ID
-ReportGenerator.artTableColHdr.password=\u30d1\u30b9\u30ef\u30fc\u30c9
-ReportGenerator.artTableColHdr.replytoAddress=\u8fd4\u4fe1\u30a2\u30c9\u30ec\u30b9
-ReportGenerator.artTableColHdr.mailServer=\u30e1\u30fc\u30eb\u30b5\u30fc\u30d0
-ReportGenerator.artTableColHdr.tags=\u30bf\u30b0
-ReportHTML.addThumbRows.dataType.title=\u30bf\u30b0\u4ed8\u3051\u3055\u308c\u305f\u30a4\u30e1\u30fc\u30b8 - {0}
-ReportHTML.addThumbRows.dataType.msg=\u30a4\u30e1\u30fc\u30b8\u3092\u542b\u3080\u30bf\u30b0\u4ed8\u3051\u3055\u308c\u305f\u7d50\u679c\u304a\u3088\u3073\u30b3\u30f3\u30c6\u30f3\u30c4\u3002
-ReportHTML.thumbLink.tags=\u30bf\u30b0\uff1a
-ReportHTML.getName.text=\u7d50\u679c - HTML
-ReportHTML.getDesc.text=HTML\u5f62\u5f0f\u306e\u7d50\u679c\u304a\u3088\u3073\u30bf\u30b0\u4ed8\u3051\u3055\u308c\u305f\u30a2\u30a4\u30c6\u30e0\u306e\u30ec\u30dd\u30fc\u30c8
-ReportHTML.writeIndex.title=\u30b1\u30fc\u30b9{0}\u306eAutopsy\u30ec\u30dd\u30fc\u30c8
-ReportHTML.writeNav.title=\u30ec\u30dd\u30fc\u30c8\u30ca\u30d3\u30b2\u30fc\u30b7\u30e7\u30f3
-ReportHTML.writeNav.h1=\u30ec\u30dd\u30fc\u30c8\u30ca\u30d3\u30b2\u30fc\u30b7\u30e7\u30f3
-ReportHTML.writeNav.summary=\u30b1\u30fc\u30b9\u30b5\u30de\u30ea\u30fc
-ReportHTML.writeSum.title=\u30b1\u30fc\u30b9\u30b5\u30de\u30ea\u30fc
-ReportHTML.writeSum.caseName=\u30b1\u30fc\u30b9\uff1a
-ReportHTML.writeSum.caseNum=\u30b1\u30fc\u30b9\u756a\u53f7\uff1a
-ReportHTML.writeSum.examiner=\u8abf\u67fb\u62c5\u5f53\u8005\uff1a
-ReportHTML.writeSum.numImages=\u30a4\u30e1\u30fc\u30b8\u6570\uff1a
-ReportHTML.writeSum.path=\u30d1\u30b9\uff1a
-ReportProgressPanel.start.cancelButton.text=\u30ad\u30e3\u30f3\u30bb\u30eb
-ReportProgressPanel.complete.processLbl.text=\u5b8c\u4e86
-ReportProgressPanel.complete.cancelButton.text=\u5b8c\u4e86
-ReportProgressPanel.cancel.cancelButton.toolTipText=\u30ad\u30e3\u30f3\u30bb\u30eb\u3055\u308c\u307e\u3057\u305f
-ReportWizardAction.actionName.text=\u30ec\u30dd\u30fc\u30c8\u3092\u751f\u6210
-ReportWizardAction.reportWiz.title=\u30ec\u30dd\u30fc\u30c8\u3092\u751f\u6210
-ReportWizardAction.toolBarButton.text=\u30ec\u30dd\u30fc\u30c8\u3092\u751f\u6210
-ReportWizardPanel1.nextButton.text=\u6b21 >
-ReportWizardPanel2.nextButton.text=\u6b21 >
-ReportGenerator.artTableColHdr.direction=\u65b9\u5411
-ReportGenerator.artTableColHdr.fromEmail=\u9001\u4fe1\u5143E\u30e1\u30fc\u30eb
-ReportGenerator.artTableColHdr.toEmail=\u9001\u4fe1\u5148E\u30e1\u30fc\u30eb
-ReportGenerator.artTableColHdr.fromPhoneNum=\u767a\u4fe1\u8005\u96fb\u8a71\u756a\u53f7
-ReportGenerator.artTableColHdr.toPhoneNum=\u7740\u4fe1\u8005\u96fb\u8a71\u756a\u53f7
-ReportGenerator.artTableColHdr.appName=\u30a2\u30d7\u30ea\u30b1\u30fc\u30b7\u30e7\u30f3\u540d
-ReportGenerator.artTableColHdr.appPath=\u30a2\u30d7\u30ea\u30b1\u30fc\u30b7\u30e7\u30f3\u30d1\u30b9
-ReportHTML.writeIndex.noFrames.msg=\u4f7f\u7528\u3057\u3066\u3044\u308b\u30d6\u30e9\u30a6\u30b6\u306f\u5f0a\u793e\u306e\u30d5\u30ec\u30fc\u30e0\u30bb\u30c3\u30c8\u30a2\u30c3\u30d7\u3068\u306e\u4e92\u63db\u6027\u304c\u3042\u308a\u307e\u305b\u3093\u3002
-ReportHTML.writeIndex.noFrames.seeNav=\u30a2\u30fc\u30c6\u30a3\u30d5\u30a1\u30af\u30c8\u30ea\u30f3\u30af\u306f\u4e0b\u8a18\u306e\u30ca\u30d3\u30b2\u30fc\u30b7\u30e7\u30f3\u30da\u30fc\u30b8</a>\u3092\u3054\u89a7\u4e0b\u3055\u3044<a href\="nav.html">
-ReportHTML.writeIndex.seeSum=\u307e\u305f\u3001\u30b1\u30fc\u30b9\u30b5\u30de\u30ea\u30fc\u306f\u4e0b\u8a18\u306e\u30b5\u30de\u30ea\u30fc\u30da\u30fc\u30b8</a>\u3092\u3054\u89a7\u4e0b\u3055\u3044\u3002<a href\="summary.html">
-ReportHTML.writeSum.warningMsg=<span>\u8b66\u544a\u3001\u30a4\u30f3\u30b8\u30a7\u30b9\u30c8\u30b5\u30fc\u30d3\u30b9\u304c\u5b8c\u4e86\u3059\u308b\u524d\u306b\u30ec\u30dd\u30fc\u30c8\u304c\u5b9f\u884c\u3055\u308c\u307e\u3057\u305f\uff01</span>
-ReportHTML.writeSum.noExaminer=<i>\u8abf\u67fb\u62c5\u5f53\u8005\u7121\u3057</i>
-ReportHTML.writeSum.imageInfoHeading=<h2>\u30a4\u30e1\u30fc\u30b8\u60c5\u5831\uff1a</h2>
-ReportHTML.writeSum.timezone=\u30bf\u30a4\u30e0\u30be\u30fc\u30f3\uff1a
-ReportProgressPanel.progress.queuing=\u30ad\u30e5\u30fc\u30a4\u30f3\u30b0\u2026
-ReportProgressPanel.initPathLabel.noFile=<html><u>\u30ec\u30dd\u30fc\u30c8\u30d5\u30a1\u30a4\u30eb\u7121\u3057</u></html>
-ReportProgressPanel.start.progress.text=\u30ec\u30dd\u30fc\u30c8\u958b\u59cb\u4e2d\u2026
-ReportProgressPanel.cancel.procLbl.text=\u30ad\u30e3\u30f3\u30bb\u30eb\u3055\u308c\u307e\u3057\u305f
-ReportVisualPanel1.getName.text=\u30ec\u30dd\u30fc\u30c8\u30e2\u30b8\u30e5\u30fc\u30eb\u306e\u9078\u629e\u304a\u3088\u3073\u8a2d\u5b9a
-ReportVisualPanel2.getName.text=\u30a2\u30fc\u30c6\u30a3\u30d5\u30a1\u30af\u30c8\u30ec\u30dd\u30fc\u30c8\u3092\u8a2d\u5b9a
-ReportWizardFileOptionsPanel.finishButton.text=\u7d42\u4e86
-ReportWizardFileOptionsVisualPanel.getName.text=\u30d5\u30a1\u30a4\u30eb\u30ec\u30dd\u30fc\u30c8\u3092\u8a2d\u5b9a
-ReportWizardPanel1.finishButton.text=\u7d42\u4e86
-ReportWizardPanel2.finishButton.text=\u7d42\u4e86
-ReportHTML.writeSum.reportGenOn.text={0}\u306bHTML\u30ec\u30dd\u30fc\u30c8\u306f\u751f\u6210\u3055\u308c\u307e\u3057\u305f
-ReportHTML.writeSum.noCaseNum=<i>\u30b1\u30fc\u30b9\u756a\u53f7\u304c\u3042\u308a\u307e\u305b\u3093</i>
-ReportGenerator.errors.reportErrorTitle=\u30ec\u30dd\u30fc\u30c8\u751f\u6210\u4e2d\u306b\u30a8\u30e9\u30fc\u304c\u767a\u751f\u3057\u307e\u3057\u305f
-ReportGenerator.errors.reportErrorText=\u30ec\u30dd\u30fc\u30c8\u751f\u6210\u4e2d\u306b\u30a8\u30e9\u30fc\u304c\u767a\u751f\u3057\u307e\u3057\u305f\uff1a
-ReportKML.getDesc.text=\u95a2\u9023\u30d5\u30a1\u30a4\u30eb\u306e\u5ea7\u6a19\u3092\u542b\u3080KML\u30d5\u30a9\u30fc\u30de\u30c3\u30c8\u306e\u30ec\u30dd\u30fc\u30c8\u3002\u3053\u306e\u30d5\u30a9\u30fc\u30de\u30c3\u30c8\u306fGoogle Earth\u30d3\u30e5\u30fc\u306b\u4f7f\u7528\u3067\u304d\u307e\u3059\u3002
-ReportKML.getName.text=Google Earth/KML
-ReportKML.progress.loading=\u30d5\u30a1\u30a4\u30eb\u306e\u8aad\u307f\u8fbc\u307f\u4e2d\u2026
-ReportKML.progress.querying=\u30d5\u30a1\u30a4\u30eb\u306e\u30af\u30a8\u30ea\u3092\u5b9f\u884c\u4e2d\u2026
-ReportBodyFile.generateReport.srcModuleName.text=TSK\u30dc\u30c7\u30a3\u30d5\u30a1\u30a4\u30eb
-ReportExcel.endReport.srcModuleName.text=Excel\u30ec\u30dd\u30fc\u30c8
-ReportGenerator.artTableColHdr.extension.text=\u62e1\u5f35\u5b50
-ReportGenerator.artTableColHdr.mimeType.text=MIME\u30bf\u30a4\u30d7
-ReportHTML.writeIndex.srcModuleName.text=HTML\u30ec\u30dd\u30fc\u30c8
-ReportKML.genReport.reportName=KML\u30ec\u30dd\u30fc\u30c8
-ReportGenerator.artTableColHdr.associatedArtifact=\u95a2\u4fc2\u3059\u308b\u30a2\u30fc\u30c6\u30a3\u30d5\u30a1\u30af\u30c8
-ReportGenerator.artTableColHdr.count=\u30ab\u30a6\u30f3\u30c8
-ReportGenerator.artTableColHdr.devMake=\u6a5f\u5668\u578b\u540d
-ReportGenerator.artTableColHdr.latitudeEnd=\u5230\u7740\u7def\u5ea6
-ReportGenerator.artTableColHdr.latitudeStart=\u51fa\u767a\u7def\u5ea6
-ReportGenerator.artTableColHdr.localPath=\u30ed\u30fc\u30ab\u30eb\u30d1\u30b9
-ReportGenerator.artTableColHdr.longitudeEnd=\u5230\u7740\u7d4c\u5ea6
-ReportGenerator.artTableColHdr.longitudeStart=\u51fa\u767a\u7d4c\u5ea6
-ReportGenerator.artTableColHdr.osInstallDate.text=\u30a4\u30f3\u30b9\u30c8\u30fc\u30eb\u65e5\u4ed8
-ReportGenerator.artTableColHdr.osName.text=\u30aa\u30da\u30ec\u30fc\u30c6\u30a3\u30f3\u30b0\u30b7\u30b9\u30c6\u30e0\u540d
-ReportGenerator.artTableColHdr.processorArchitecture.text=\u30d7\u30ed\u30bb\u30c3\u30b5\u30a2\u30fc\u30ad\u30c6\u30af\u30c1\u30e3
-ReportGenerator.artTableColHdr.readStatus=\u8aad\u307f\u53d6\u308a\u4e2d\u30b9\u30c6\u30fc\u30bf\u30b9
-ReportGenerator.artTableColHdr.remotePath=\u30ea\u30e2\u30fc\u30c8\u30d1\u30b9
-ReportGenerator.artTableColHdr.tskDateTimeRcvd=\u53d7\u4fe1\u65e5
-ReportGenerator.artTableColHdr.tskDateTimeSent=\u9001\u4fe1\u65e5
-ReportGenerator.artTableColHdr.tskEmailBcc=E-Mail BCC
-ReportGenerator.artTableColHdr.tskEmailCc=E-Mail CC
-ReportGenerator.artTableColHdr.tskEmailFrom=E-Mail\u9001\u4fe1\u5143
-ReportGenerator.artTableColHdr.tskEmailTo=E-Mail\u9001\u4fe1\u5148
-ReportGenerator.artTableColHdr.tskGpsRouteCategory=\u30ab\u30c6\u30b4\u30ea
-ReportGenerator.artTableColHdr.tskInterestingFilesCategory=\u30eb\u30fc\u30eb
-ReportGenerator.artTableColHdr.tskMsgId=\u30e1\u30c3\u30bb\u30fc\u30b8ID
-ReportGenerator.artTableColHdr.tskPath=\u30d1\u30b9
-ReportGenerator.artTableColHdr.tskSetName=\u30bb\u30c3\u30c8\u540d
-ReportGenerator.artTableColHdr.tskSubject=\u30b5\u30d6\u30b8\u30a7\u30af\u30c8
-ReportGenerator.artTableColHdr.urlDomainDecoded=URL\u30c9\u30e1\u30a4\u30f3
-ReportGenerator.artTableColHdr.userName=\u30e6\u30fc\u30b6\u540d
-ReportGenerator.errList.coreExceptionWhileGenRptRow=\u30a2\u30fc\u30c6\u30a3\u30d5\u30a1\u30af\u30c8\u30ec\u30dd\u30fc\u30c8\u7528\u30ed\u30fc\u30c7\u30fc\u30bf\u306e\u751f\u6210\u4e2d\u306b\u30b3\u30a2\u30a8\u30af\u30bb\u30d7\u30b7\u30e7\u30f3\uff08\u4f8b\u5916\uff09\u304c\u691c\u51fa\u3055\u308c\u307e\u3057\u305f
-ReportGenerator.errList.errGetContentFromBBArtifact=Blackboard\u30a2\u30fc\u30c6\u30a3\u30d5\u30a1\u30af\u30c8\u304b\u3089\u30ec\u30dd\u30fc\u30c8\u7528\u306e\u30b3\u30f3\u30c6\u30f3\u30c4\u3092\u53d6\u5f97\u4e2d\u306b\u30a8\u30e9\u30fc\u304c\u767a\u751f\u3057\u307e\u3057\u305f\u3002
-ReportGenerator.errList.failedGetAbstractFileByID=ID\u306b\u57fa\u3065\u304d\u30a2\u30d6\u30b9\u30c8\u30e9\u30af\u30c8\u30d5\u30a1\u30a4\u30eb\u3092\u53d6\u5f97\u3059\u308b\u306e\u3092\u5931\u6557\u3057\u307e\u3057\u305f
-ReportGenerator.errList.failedGetBBArtifacts=\u30ec\u30dd\u30fc\u30c8\u751f\u6210\u4e2d\u306bBlackboard\u30a2\u30fc\u30c6\u30a3\u30d5\u30a1\u30af\u30c8\u306e\u53d6\u5f97\u306b\u5931\u6557\u3057\u307e\u3057\u305f\u3002
-ReportGenerator.errList.failedGetBBArtifactTags=Blackboard\u30a2\u30fc\u30c6\u30a3\u30d5\u30a1\u30af\u30c8\u30bf\u30b0\u306e\u53d6\u5f97\u306b\u5931\u6557\u3057\u307e\u3057\u305f\u3002
-ReportGenerator.errList.failedGetBBAttribs=\u30ec\u30dd\u30fc\u30c8\u751f\u6210\u4e2d\u306bBlackboard\u5c5e\u6027\u306e\u53d6\u5f97\u306b\u5931\u6557\u3057\u307e\u3057\u305f\u3002
-ReportGenerator.errList.failedGetContentTags=\u30b3\u30f3\u30c6\u30f3\u30c4\u30bf\u30b0\u306e\u53d6\u5f97\u306b\u5931\u6557\u3057\u307e\u3057\u305f\u3002
-ReportGenerator.errList.failedMakeRptFolder=\u30ec\u30dd\u30fc\u30c8\u30d5\u30a9\u30eb\u30c0\u306e\u4f5c\u6210\u306b\u5931\u6557\u3057\u307e\u3057\u305f\u3002\u30ec\u30dd\u30fc\u30c8\u751f\u6210\u304c\u3067\u304d\u306a\u3044\u304b\u3082\u3057\u308c\u307e\u305b\u3093\u3002
-ReportGenerator.errList.failedQueryHashsetHits=\u30cf\u30c3\u30b7\u30e5\u30bb\u30c3\u30c8\u30d2\u30c3\u30c8\u3092\u30af\u30a8\u30ea\u3059\u308b\u306e\u306b\u5931\u6557\u3057\u307e\u3057\u305f\u3002
-ReportGenerator.errList.failedQueryHashsetLists=\u30cf\u30c3\u30b7\u30e5\u30bb\u30c3\u30c8\u30ea\u30b9\u30c8\u3092\u30af\u30a8\u30ea\u3059\u308b\u306e\u306b\u5931\u6557\u3057\u307e\u3057\u305f\u3002
-ReportGenerator.errList.failedQueryKWLists=\u30ad\u30fc\u30ef\u30fc\u30c9\u30ea\u30b9\u30c8\u3092\u30af\u30a8\u30ea\u3059\u308b\u306e\u306b\u5931\u6557\u3057\u307e\u3057\u305f\u3002
-ReportGenerator.errList.failedQueryKWs=\u30ad\u30fc\u30ef\u30fc\u30c9\u3092\u30af\u30a8\u30ea\u3059\u308b\u306e\u306b\u5931\u6557\u3057\u307e\u3057\u305f\u3002
-ReportGenerator.htmlOutput.header.comment=\u30b3\u30e1\u30f3\u30c8
-ReportGenerator.htmlOutput.header.file=\u30d5\u30a1\u30a4\u30eb
-ReportGenerator.htmlOutput.header.hash=\u30cf\u30c3\u30b7\u30e5
-ReportGenerator.htmlOutput.header.size=\u30b5\u30a4\u30ba\uff08\u30d0\u30a4\u30c8\uff09
-ReportGenerator.htmlOutput.header.tag=\u30bf\u30b0
-ReportGenerator.htmlOutput.header.timeAccessed=\u30a2\u30af\u30bb\u30b9\u65e5\u6642
-ReportGenerator.htmlOutput.header.timeCreated=\u4f5c\u6210\u65e5\u6642
-ReportGenerator.htmlOutput.header.timeModified=\u4fee\u6b63\u65e5\u6642
-ReportGenerator.notifyErr.errsDuringRptGen=\u30ec\u30dd\u30fc\u30c8\u751f\u6210\u4e2d\u306e\u30a8\u30e9\u30fc\uff1a
-ReportGenerator.errList.failedGetAbstractFileFromID=ID\u306b\u57fa\u3065\u304d\u30a2\u30d6\u30b9\u30c8\u30e9\u30af\u30c8\u30d5\u30a1\u30a4\u30eb\u3092\u53d6\u5f97\u3059\u308b\u306e\u3092\u5931\u6557\u3057\u307e\u3057\u305f
-ReportKML.getFilePath.text=\u30ec\u30dd\u30fc\u30c8KML.kml
-ReportVisualPanel1.invalidModuleWarning=\u7121\u52b9\u306a\u30ec\u30dd\u30fc\u30c8\u30e2\u30b8\u30e5\u30fc\u30eb({0})\u306b\u906d\u9047\u3057\u307e\u3057\u305f
-ReportGenerationPanel.confDlg.cancelReport.msg=\u672c\u5f53\u306b\u30ec\u30dd\u30fc\u30c8\u3092\u30ad\u30e3\u30f3\u30bb\u30eb\u3057\u307e\u3059\u304b\uff1f
-ReportProgressPanel.complete.processLb2.text=\u5b8c\u4e86\u3057\u307e\u3057\u305f\u304c\u3001\u30a8\u30e9\u30fc\u304c\u767a\u751f\u3057\u307e\u3057\u305f
-ReportGenerationPanel.cancelButton.actionCommand=\u30ad\u30e3\u30f3\u30bb\u30eb
-ReportGenerationPanel.cancelButton.text=\u30ad\u30e3\u30f3\u30bb\u30eb
-ReportProgressDialog.separationLabel.text=:
-ReportProgressDialog.pathLabel.text=\u30d1\u30b9\u30e9\u30d9\u30eb
-ReportProgressDialog.reportLabel.text=\u30ec\u30dd\u30fc\u30c8\u30e9\u30d9\u30eb
-ReportProgressDialog.statusMessageLabel.text=\u30d7\u30ed\u30bb\u30b7\u30f3\u30b0\u30e9\u30d9\u30eb
diff --git a/Core/src/org/sleuthkit/autopsy/report/GeneralReportModuleAdapter.java b/Core/src/org/sleuthkit/autopsy/report/GeneralReportModuleAdapter.java
index f66b1c69a2..fb06c39e6a 100644
--- a/Core/src/org/sleuthkit/autopsy/report/GeneralReportModuleAdapter.java
+++ b/Core/src/org/sleuthkit/autopsy/report/GeneralReportModuleAdapter.java
@@ -19,6 +19,7 @@
 package org.sleuthkit.autopsy.report;
 
 import javax.swing.JPanel;
+import org.sleuthkit.autopsy.report.ReportProgressPanel;
 
 /**
  * An adapter that provides no-op implementations of various GeneralReportModule
diff --git a/Core/src/org/sleuthkit/autopsy/report/NoReportModuleSettings.java b/Core/src/org/sleuthkit/autopsy/report/NoReportModuleSettings.java
index ad5fd9a09f..e647829487 100755
--- a/Core/src/org/sleuthkit/autopsy/report/NoReportModuleSettings.java
+++ b/Core/src/org/sleuthkit/autopsy/report/NoReportModuleSettings.java
@@ -18,6 +18,8 @@
  */
 package org.sleuthkit.autopsy.report;
 
+import org.sleuthkit.autopsy.report.ReportModuleSettings;
+
 /**
  * Implementation of the ReportModuleSettings interface for use by report
  * modules that do not have settings.
diff --git a/Core/src/org/sleuthkit/autopsy/report/ReportBranding.java b/Core/src/org/sleuthkit/autopsy/report/ReportBranding.java
index 66970eae9b..c5ad6ce4a6 100644
--- a/Core/src/org/sleuthkit/autopsy/report/ReportBranding.java
+++ b/Core/src/org/sleuthkit/autopsy/report/ReportBranding.java
@@ -18,6 +18,8 @@
  */
 package org.sleuthkit.autopsy.report;
 
+import org.sleuthkit.autopsy.report.infrastructure.ReportBrandingProviderI;
+import org.sleuthkit.autopsy.report.infrastructure.ReportGenerator;
 import java.io.File;
 import java.io.IOException;
 import java.util.logging.Level;
diff --git a/Core/src/org/sleuthkit/autopsy/report/ReportModule.java b/Core/src/org/sleuthkit/autopsy/report/ReportModule.java
index f6a072f2fa..fb881e42a1 100644
--- a/Core/src/org/sleuthkit/autopsy/report/ReportModule.java
+++ b/Core/src/org/sleuthkit/autopsy/report/ReportModule.java
@@ -27,7 +27,7 @@ import javax.swing.JPanel;
 /**
  * Interface for report modules that plug in to the reporting infrastructure.
  */
-interface ReportModule {
+public interface ReportModule {
 
     /**
      * Get the name of the report this module generates.
diff --git a/Core/src/org/sleuthkit/autopsy/report/ArtifactSelectionDialog.form b/Core/src/org/sleuthkit/autopsy/report/infrastructure/ArtifactSelectionDialog.form
similarity index 84%
rename from Core/src/org/sleuthkit/autopsy/report/ArtifactSelectionDialog.form
rename to Core/src/org/sleuthkit/autopsy/report/infrastructure/ArtifactSelectionDialog.form
index 7afc432836..2296bf28b8 100644
--- a/Core/src/org/sleuthkit/autopsy/report/ArtifactSelectionDialog.form
+++ b/Core/src/org/sleuthkit/autopsy/report/infrastructure/ArtifactSelectionDialog.form
@@ -95,7 +95,7 @@
     <Component class="javax.swing.JButton" name="okButton">
       <Properties>
         <Property name="text" type="java.lang.String" editor="org.netbeans.modules.i18n.form.FormI18nStringEditor">
-          <ResourceString bundle="org/sleuthkit/autopsy/report/Bundle.properties" key="ArtifactSelectionDialog.okButton.text" replaceFormat="org.openide.util.NbBundle.getMessage({sourceFileName}.class, &quot;{key}&quot;)"/>
+          <ResourceString bundle="org/sleuthkit/autopsy/report/infrastructure/Bundle.properties" key="ArtifactSelectionDialog.okButton.text" replaceFormat="org.openide.util.NbBundle.getMessage({sourceFileName}.class, &quot;{key}&quot;)"/>
         </Property>
       </Properties>
       <Events>
@@ -105,17 +105,17 @@
     <Component class="javax.swing.JLabel" name="titleLabel">
       <Properties>
         <Property name="text" type="java.lang.String" editor="org.netbeans.modules.i18n.form.FormI18nStringEditor">
-          <ResourceString bundle="org/sleuthkit/autopsy/report/Bundle.properties" key="ArtifactSelectionDialog.titleLabel.text" replaceFormat="org.openide.util.NbBundle.getMessage({sourceFileName}.class, &quot;{key}&quot;)"/>
+          <ResourceString bundle="org/sleuthkit/autopsy/report/infrastructure/Bundle.properties" key="ArtifactSelectionDialog.titleLabel.text" replaceFormat="org.openide.util.NbBundle.getMessage({sourceFileName}.class, &quot;{key}&quot;)"/>
         </Property>
         <Property name="toolTipText" type="java.lang.String" editor="org.netbeans.modules.i18n.form.FormI18nStringEditor">
-          <ResourceString bundle="org/sleuthkit/autopsy/report/Bundle.properties" key="ArtifactSelectionDialog.titleLabel.toolTipText" replaceFormat="org.openide.util.NbBundle.getMessage({sourceFileName}.class, &quot;{key}&quot;)"/>
+          <ResourceString bundle="org/sleuthkit/autopsy/report/infrastructure/Bundle.properties" key="ArtifactSelectionDialog.titleLabel.toolTipText" replaceFormat="org.openide.util.NbBundle.getMessage({sourceFileName}.class, &quot;{key}&quot;)"/>
         </Property>
       </Properties>
     </Component>
     <Component class="javax.swing.JButton" name="selectAllButton">
       <Properties>
         <Property name="text" type="java.lang.String" editor="org.netbeans.modules.i18n.form.FormI18nStringEditor">
-          <ResourceString bundle="org/sleuthkit/autopsy/report/Bundle.properties" key="ArtifactSelectionDialog.selectAllButton.text" replaceFormat="org.openide.util.NbBundle.getMessage({sourceFileName}.class, &quot;{key}&quot;)"/>
+          <ResourceString bundle="org/sleuthkit/autopsy/report/infrastructure/Bundle.properties" key="ArtifactSelectionDialog.selectAllButton.text" replaceFormat="org.openide.util.NbBundle.getMessage({sourceFileName}.class, &quot;{key}&quot;)"/>
         </Property>
       </Properties>
       <Events>
@@ -125,7 +125,7 @@
     <Component class="javax.swing.JButton" name="deselectAllButton">
       <Properties>
         <Property name="text" type="java.lang.String" editor="org.netbeans.modules.i18n.form.FormI18nStringEditor">
-          <ResourceString bundle="org/sleuthkit/autopsy/report/Bundle.properties" key="ArtifactSelectionDialog.deselectAllButton.text" replaceFormat="org.openide.util.NbBundle.getMessage({sourceFileName}.class, &quot;{key}&quot;)"/>
+          <ResourceString bundle="org/sleuthkit/autopsy/report/infrastructure/Bundle.properties" key="ArtifactSelectionDialog.deselectAllButton.text" replaceFormat="org.openide.util.NbBundle.getMessage({sourceFileName}.class, &quot;{key}&quot;)"/>
         </Property>
       </Properties>
       <Events>
diff --git a/Core/src/org/sleuthkit/autopsy/report/ArtifactSelectionDialog.java b/Core/src/org/sleuthkit/autopsy/report/infrastructure/ArtifactSelectionDialog.java
similarity index 99%
rename from Core/src/org/sleuthkit/autopsy/report/ArtifactSelectionDialog.java
rename to Core/src/org/sleuthkit/autopsy/report/infrastructure/ArtifactSelectionDialog.java
index a6b658bd52..96e9caebe3 100644
--- a/Core/src/org/sleuthkit/autopsy/report/ArtifactSelectionDialog.java
+++ b/Core/src/org/sleuthkit/autopsy/report/infrastructure/ArtifactSelectionDialog.java
@@ -16,7 +16,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.sleuthkit.autopsy.report;
+package org.sleuthkit.autopsy.report.infrastructure;
 
 import java.awt.Component;
 import java.awt.event.MouseAdapter;
@@ -45,7 +45,7 @@ import org.sleuthkit.datamodel.TskCoreException;
  * Allow examiner to select artifacts on which to report.
  */
 @SuppressWarnings("PMD.SingularField") // UI widgets cause lots of false positives
-public class ArtifactSelectionDialog extends javax.swing.JDialog {
+class ArtifactSelectionDialog extends javax.swing.JDialog {
 
     private ArtifactModel model;
     private ArtifactRenderer renderer;
diff --git a/Core/src/org/sleuthkit/autopsy/report/infrastructure/Bundle.properties b/Core/src/org/sleuthkit/autopsy/report/infrastructure/Bundle.properties
new file mode 100755
index 0000000000..8f0d8dae6b
--- /dev/null
+++ b/Core/src/org/sleuthkit/autopsy/report/infrastructure/Bundle.properties
@@ -0,0 +1,200 @@
+OpenIDE-Module-Name=Report
+CTL_ReportWizardAction=Run Report
+ReportWizardFileOptionsVisualPanel.jLabel1.text=Select items to include in File Report:
+ReportWizardFileOptionsVisualPanel.deselectAllButton.text=Deselect All
+ReportWizardFileOptionsVisualPanel.selectAllButton.text=Select All
+ReportWizardPortableCaseOptionsVisualPanel.errorLabel.text=Windows only
+ReportWizardPortableCaseOptionsVisualPanel.compressCheckbox.toolTipText=
+ReportWizardPortableCaseOptionsVisualPanel.compressCheckbox.text=Package case into an archive:
+ReportProgressDialog.reportLabel.text=reportLabel
+ReportProgressDialog.statusMessageLabel.text=processingLabel
+ReportProgressDialog.separationLabel.text=:
+ReportProgressDialog.pathLabel.text=pathLabel
+PortableCaseTagsListPanel.jAllTagsCheckBox.text=All Tagged Results
+PortableCaseTagsListPanel.deselectButton.text=Deselect All
+PortableCaseTagsListPanel.selectButton.text=Select All
+PortableCaseTagsListPanel.descLabel.text=Include the following tags:
+ReportGenerationPanel.cancelButton.actionCommand=Cancel
+ReportGenerationPanel.cancelButton.text=Cancel
+ReportGenerationPanel.closeButton.text=Close
+PortableCaseInterestingItemsListPanel.deselectButton.text=Deselect All
+PortableCaseInterestingItemsListPanel.selectButton.text=Select All
+PortableCaseInterestingItemsListPanel.descLabel.text=Include Interesting Items from these sets:
+PortableCaseInterestingItemsListPanel.jAllSetsCheckBox.text=All Interesting Items
+ReportVisualPanel2.allTaggedResultsRadioButton.text=All Tagged Results
+ReportVisualPanel2.advancedButton.text=Result Types
+ReportVisualPanel2.deselectAllButton.text=Deselect All
+ReportVisualPanel2.selectAllButton.text=Select All
+ReportVisualPanel2.dataLabel.text=Select which data to report on:
+ReportVisualPanel2.allResultsRadioButton.text=All Results
+ReportVisualPanel2.specificTaggedResultsRadioButton.text=Specific Tagged Results
+ReportVisualPanel1.reportModulesLabel.text=Report Modules:
+ArtifactSelectionDialog.okButton.text=OK
+ArtifactSelectionDialog.deselectAllButton.text=Deselect All
+ArtifactSelectionDialog.selectAllButton.text=Select All
+ArtifactSelectionDialog.titleLabel.toolTipText=
+ArtifactSelectionDialog.titleLabel.text=Select which result types you would like to report on:
+ArtifactSelectionDialog.dlgTitle.text=Result Type Selection
+ReportVisualPanel1.invalidModuleWarning=Encountered an invalid Report Module ({0})
+ReportGenerationPanel.titleLabel.text=Report Generation Progress
+ReportGenerationPanel.confDlg.sureToClose.msg=Are you sure you'd like to close the dialog?\nAll reports will be canceled.
+ReportGenerationPanel.confDlg.title.closing=Closing
+ReportGenerationPanel.confDlg.cancelReport.msg=Are you sure you'd like to cancel the report?
+ReportGenerator.displayProgress.title.text=Report Generation Progress...
+ReportGenerator.progress.queryingDb.text=Querying database...
+ReportGenerator.progress.processingFile.text=Now processing {0}
+ReportGenerator.artifactTable.taggedResults.text=Contains results that were tagged with one of the following:
+ReportGenerator.progress.processing=Now processing {0}...
+ReportGenerator.msgShow.skippingArtType.title=Skipping artifact type {0} in reports
+ReportGenerator.msgShow.skippingArtType.msg=Unknown columns to report on
+ReportGenerator.makeContTagTab.taggedFiles.msg=Contains files that were tagged with one of the following:
+ReportGenerator.makeBbArtTagTab.taggedRes.msg=This report only includes results tagged with:
+ReportGenerator.tagTable.header.resultType=Result Type
+ReportGenerator.tagTable.header.tag=Tag
+ReportGenerator.tagTable.header.comment=Comment
+ReportGenerator.tagTable.header.srcFile=Source File
+ReportGenerator.progress.createdThumb.text=Creating thumbnails...
+ReportGenerator.htmlOutput.header.file=File
+ReportGenerator.htmlOutput.header.tag=Tag
+ReportGenerator.htmlOutput.header.comment=Comment
+ReportGenerator.htmlOutput.header.timeModified=Modified Time
+ReportGenerator.htmlOutput.header.timeChanged=Changed Time
+ReportGenerator.htmlOutput.header.timeAccessed=Accessed Time
+ReportGenerator.htmlOutput.header.timeCreated=Created Time
+ReportGenerator.htmlOutput.header.size=Size (Bytes)
+ReportGenerator.htmlOutput.header.hash=Hash
+ReportGenerator.thumbnailTable.name=Tagged Images
+ReportGenerator.thumbnailTable.desc=Contains thumbnails of images that are associated with tagged files and results.
+ReportGenerator.writeKwHits.userSrchs=User Searches
+ReportGenerator.progress.processingList=Now processing {0} ({1})...
+ReportGenerator.artTableColHdr.url=URL
+ReportGenerator.artTableColHdr.title=Title
+ReportGenerator.artTableColHdr.dateCreated=Date Created
+ReportGenerator.artTableColHdr.program=Program
+ReportGenerator.artTableColHdr.urlDomainDecoded=URL Domain
+ReportGenerator.artTableColHdr.srcFile=Source File
+ReportGenerator.artTableColHdr.dateTime=Date/Time
+ReportGenerator.artTableColHdr.name=Name
+ReportGenerator.artTableColHdr.value=Value
+ReportGenerator.artTableColHdr.dateAccessed=Date Accessed
+ReportGenerator.artTableColHdr.referrer=Referrer
+ReportGenerator.artTableColHdr.dest=Destination
+ReportGenerator.artTableColHdr.sourceUrl=Source URL
+ReportGenerator.artTableColHdr.path=Path
+ReportGenerator.artTableColHdr.progName=Program Name
+ReportGenerator.artTableColHdr.instDateTime=Install Date/Time
+ReportGenerator.artTableColHdr.preview=Preview
+ReportGenerator.artTableColHdr.file=File
+ReportGenerator.artTableColHdr.size=Size
+ReportGenerator.artTableColHdr.deviceId=Device ID
+ReportGenerator.artTableColHdr.text=Text
+ReportGenerator.artTableColHdr.domain=Domain
+ReportGenerator.artTableColHdr.dateTaken=Date Taken
+ReportGenerator.artTableColHdr.devManufacturer=Device Manufacturer
+ReportGenerator.artTableColHdr.devMake=Device Make
+ReportGenerator.artTableColHdr.devModel=Device Model
+ReportGenerator.artTableColHdr.latitude=Latitude
+ReportGenerator.artTableColHdr.longitude=Longitude
+ReportGenerator.artTableColHdr.latitudeStart=Starting Latitude
+ReportGenerator.artTableColHdr.longitudeStart=Starting Longitude
+ReportGenerator.artTableColHdr.latitudeEnd=Ending Latitude
+ReportGenerator.artTableColHdr.longitudeEnd=Ending Longitude
+ReportGenerator.artTableColHdr.associatedArtifact=Associated Artifact
+ReportGenerator.artTableColHdr.count=Count
+ReportGenerator.artTableColHdr.personName=Person Name
+ReportGenerator.artTableColHdr.phoneNumber=Phone Number
+ReportGenerator.artTableColHdr.phoneNumHome=Phone Number (Home)
+ReportGenerator.artTableColHdr.phoneNumOffice=Phone Number (Office)
+ReportGenerator.artTableColHdr.phoneNumMobile=Phone Number (Mobile)
+ReportGenerator.artTableColHdr.email=Email
+ReportGenerator.artTableColHdr.msgType=Message Type
+ReportGenerator.artTableColHdr.direction=Direction
+ReportGenerator.artTableColHdr.readStatus=Read Status
+ReportGenerator.artTableColHdr.fromPhoneNum=From Phone Number
+ReportGenerator.artTableColHdr.fromEmail=From Email
+ReportGenerator.artTableColHdr.toPhoneNum=To Phone Number
+ReportGenerator.artTableColHdr.toEmail=To Email
+ReportGenerator.artTableColHdr.subject=Subject
+ReportGenerator.artTableColHdr.tskEmailTo=E-Mail To
+ReportGenerator.artTableColHdr.tskEmailCc=E-Mail CC
+ReportGenerator.artTableColHdr.tskEmailBcc=E-Mail BCC
+ReportGenerator.artTableColHdr.tskEmailFrom=E-Mail From
+ReportGenerator.artTableColHdr.tskMsgId=Message ID
+ReportGenerator.artTableColHdr.tskDateTimeRcvd=Date Received
+ReportGenerator.artTableColHdr.tskDateTimeSent=Date Sent
+ReportGenerator.artTableColHdr.tskSubject=Subject
+ReportGenerator.artTableColHdr.tskSetName=Set Name
+ReportGenerator.artTableColHdr.tskInterestingFilesCategory=Rule
+ReportGenerator.artTableColHdr.tskGpsRouteCategory=Category
+ReportGenerator.artTableColHdr.tskPath=Path
+ReportGenerator.artTableColHdr.calendarEntryType=Calendar Entry Type
+ReportGenerator.artTableColHdr.description=Description
+ReportGenerator.artTableColHdr.startDateTime=Start Date/Time
+ReportGenerator.artTableColHdr.endDateTime=End Date/Time
+ReportGenerator.artTableColHdr.location=Location
+ReportGenerator.artTableColHdr.shortCut=Short Cut
+ReportGenerator.artTableColHdr.deviceName=Device Name
+ReportGenerator.artTableColHdr.deviceAddress=Device Address
+ReportGenerator.artTableColHdr.altitude=Altitude
+ReportGenerator.artTableColHdr.locationAddress=Location Address
+ReportGenerator.artTableColHdr.category=Category
+ReportGenerator.artTableColHdr.userId=User ID
+ReportGenerator.artTableColHdr.userName=User Name
+ReportGenerator.artTableColHdr.password=Password
+ReportGenerator.artTableColHdr.appName=App Name
+ReportGenerator.artTableColHdr.appPath=App Path
+ReportGenerator.artTableColHdr.replytoAddress=ReplyTo Address
+ReportGenerator.artTableColHdr.mailServer=Mail Server
+ReportGenerator.artTableColHdr.tags=Tags
+ReportGenerator.artTableColHdr.localPath=Local path
+ReportGenerator.artTableColHdr.remotePath=Remote path
+ReportGenerator.errors.reportErrorTitle=Error generating report
+ReportGenerator.errors.reportErrorText=Error generating report: 
+ReportProgressDialog.progress.queuing=Queuing...
+ReportProgressDialog.initPathLabel.noFile=<html><u>No report file</u></html>
+ReportProgressDialog.start.cancelButton.text=Cancel
+ReportProgressDialog.start.progress.text=Starting report...
+ReportProgressDialog.complete.processLbl.text=Complete
+ReportProgressDialog.complete.processLb2.text=Completed with error
+ReportProgressDialog.complete.cancelButton.text=Complete
+ReportProgressDialog.cancel.cancelButton.toolTipText=Canceled
+ReportProgressDialog.cancel.procLbl.text=Canceled
+ReportVisualPanel1.getName.text=Select and Configure Report Modules
+ReportVisualPanel2.getName.text=Configure Report
+ReportWizardAction.actionName.text=Generate Report
+ReportWizardAction.reportWiz.title=Generate Report
+ReportWizardAction.toolBarButton.text=Generate Report
+ReportWizardFileOptionsPanel.finishButton.text=Finish
+ReportWizardFileOptionsVisualPanel.getName.text=Configure File Report
+ReportWizardPanel1.nextButton.text=Next >
+ReportWizardPanel1.finishButton.text=Finish
+ReportWizardPanel2.finishButton.text=Finish
+ReportWizardPanel2.nextButton.text=Next >
+ReportGenerator.artTableColHdr.extension.text=Extension
+ReportGenerator.artTableColHdr.mimeType.text=MIME Type
+ReportGenerator.artTableColHdr.processorArchitecture.text=Processor Architecture
+ReportGenerator.artTableColHdr.osName.text=Operating System Name
+ReportGenerator.artTableColHdr.osInstallDate.text=Install Date
+ReportGenerator.errList.failedMakeRptFolder=Failed to make report folder, may be unable to generate reports.
+ReportGenerator.notifyErr.errsDuringRptGen=Errors during report generation:
+ReportGenerator.errList.failedGetAllTagsArtifacts=Failed get all possible tag names and artifact types.
+ReportGenerator.errList.noReportSettings=Report settings have not been configured.
+ReportGenerator.errList.failedGetContentTags=Failed to get content tags.
+ReportGenerator.errList.failedGetBBArtifactTags=Failed to get blackboard artifact tags.
+ReportGenerator.errList.errGetContentFromBBArtifact=Error while getting content from a blackboard artifact to report on.
+ReportGenerator.errList.failedGetBBAttribs=Failed to get Blackboard Attributes when generating report.
+ReportGenerator.errList.failedGetBBArtifacts=Failed to get Blackboard Artifacts when generating report.
+ReportGenerator.errList.failedQueryKWLists=Failed to query keyword lists.
+ReportGenerator.errList.failedGetAbstractFileByID=Failed to get Abstract File by ID.
+ReportGenerator.errList.failedQueryKWs=Failed to query keywords.
+ReportGenerator.errList.failedQueryHashsetLists=Failed to query hashset lists.
+ReportGenerator.errList.failedGetAbstractFileFromID=Failed to get Abstract File from ID.
+ReportGenerator.errList.failedQueryHashsetHits=Failed to query hashsets hits.
+ReportGenerator.errList.coreExceptionWhileGenRptRow=Core exception while generating row data for artifact report.
+CreatePortableCasePanel.selectAllButton.text=Select All
+CreatePortableCasePanel.deselectAllButton.text=Deselect All
+CreatePortableCasePanel.outputFolderTextField.text=jTextField1
+CreatePortableCasePanel.chooseOutputFolderButton.text=Choose folder
+CreatePortableCasePanel.jLabel1.text=Export files tagged as:
+CreatePortableCasePanel.jLabel2.text=Select output folder:
+CreatePortableCasePanel.errorLabel.text_1=Windows only
diff --git a/Core/src/org/sleuthkit/autopsy/report/infrastructure/Bundle.properties-MERGED b/Core/src/org/sleuthkit/autopsy/report/infrastructure/Bundle.properties-MERGED
new file mode 100755
index 0000000000..9de9b638d0
--- /dev/null
+++ b/Core/src/org/sleuthkit/autopsy/report/infrastructure/Bundle.properties-MERGED
@@ -0,0 +1,211 @@
+OpenIDE-Module-Name=Report
+CTL_ReportWizardAction=Run Report
+PortableCaseInterestingItemsListPanel.error.errorLoadingTags=Error loading interesting item set names
+PortableCaseInterestingItemsListPanel.error.errorTitle=Error getting intesting item set names for case
+PortableCaseInterestingItemsListPanel.error.noOpenCase=There is no case open
+PortableCaseTagsListPanel.error.errorLoadingTags=Error loading tags
+PortableCaseTagsListPanel.error.errorTitle=Error getting tag names for case
+PortableCaseTagsListPanel.error.noOpenCase=There is no case open
+ReportGenerator.artTableColHdr.comment=Comment
+ReportGenerator.errList.noOpenCase=No open case available.
+ReportGenerator.tagTable.header.userName=User Name
+ReportWizardFileOptionsVisualPanel.jLabel1.text=Select items to include in File Report:
+ReportWizardFileOptionsVisualPanel.deselectAllButton.text=Deselect All
+ReportWizardFileOptionsVisualPanel.selectAllButton.text=Select All
+ReportWizardPortableCaseOptionsVisualPanel.errorLabel.text=Windows only
+ReportWizardPortableCaseOptionsVisualPanel.compressCheckbox.toolTipText=
+ReportWizardPortableCaseOptionsVisualPanel.compressCheckbox.text=Package case into an archive:
+ReportProgressDialog.reportLabel.text=reportLabel
+ReportProgressDialog.statusMessageLabel.text=processingLabel
+ReportProgressDialog.separationLabel.text=:
+ReportProgressDialog.pathLabel.text=pathLabel
+PortableCaseTagsListPanel.jAllTagsCheckBox.text=All Tagged Results
+PortableCaseTagsListPanel.deselectButton.text=Deselect All
+PortableCaseTagsListPanel.selectButton.text=Select All
+PortableCaseTagsListPanel.descLabel.text=Include the following tags:
+ReportGenerationPanel.cancelButton.actionCommand=Cancel
+ReportGenerationPanel.cancelButton.text=Cancel
+ReportGenerationPanel.closeButton.text=Close
+PortableCaseInterestingItemsListPanel.deselectButton.text=Deselect All
+PortableCaseInterestingItemsListPanel.selectButton.text=Select All
+PortableCaseInterestingItemsListPanel.descLabel.text=Include Interesting Items from these sets:
+PortableCaseInterestingItemsListPanel.jAllSetsCheckBox.text=All Interesting Items
+ReportVisualPanel2.allTaggedResultsRadioButton.text=All Tagged Results
+ReportVisualPanel2.advancedButton.text=Result Types
+ReportVisualPanel2.deselectAllButton.text=Deselect All
+ReportVisualPanel2.selectAllButton.text=Select All
+ReportVisualPanel2.dataLabel.text=Select which data to report on:
+ReportVisualPanel2.allResultsRadioButton.text=All Results
+ReportVisualPanel2.specificTaggedResultsRadioButton.text=Specific Tagged Results
+ReportVisualPanel1.reportModulesLabel.text=Report Modules:
+ArtifactSelectionDialog.okButton.text=OK
+ArtifactSelectionDialog.deselectAllButton.text=Deselect All
+ArtifactSelectionDialog.selectAllButton.text=Select All
+ArtifactSelectionDialog.titleLabel.toolTipText=
+ArtifactSelectionDialog.titleLabel.text=Select which result types you would like to report on:
+ArtifactSelectionDialog.dlgTitle.text=Result Type Selection
+ReportVisualPanel1.invalidModuleWarning=Encountered an invalid Report Module ({0})
+ReportGenerationPanel.titleLabel.text=Report Generation Progress
+ReportGenerationPanel.confDlg.sureToClose.msg=Are you sure you'd like to close the dialog?\nAll reports will be canceled.
+ReportGenerationPanel.confDlg.title.closing=Closing
+ReportGenerationPanel.confDlg.cancelReport.msg=Are you sure you'd like to cancel the report?
+ReportGenerator.displayProgress.title.text=Report Generation Progress...
+ReportGenerator.progress.queryingDb.text=Querying database...
+ReportGenerator.progress.processingFile.text=Now processing {0}
+ReportGenerator.artifactTable.taggedResults.text=Contains results that were tagged with one of the following:
+ReportGenerator.progress.processing=Now processing {0}...
+ReportGenerator.msgShow.skippingArtType.title=Skipping artifact type {0} in reports
+ReportGenerator.msgShow.skippingArtType.msg=Unknown columns to report on
+ReportGenerator.makeContTagTab.taggedFiles.msg=Contains files that were tagged with one of the following:
+ReportGenerator.makeBbArtTagTab.taggedRes.msg=This report only includes results tagged with:
+ReportGenerator.tagTable.header.resultType=Result Type
+ReportGenerator.tagTable.header.tag=Tag
+ReportGenerator.tagTable.header.comment=Comment
+ReportGenerator.tagTable.header.srcFile=Source File
+ReportGenerator.progress.createdThumb.text=Creating thumbnails...
+ReportGenerator.htmlOutput.header.file=File
+ReportGenerator.htmlOutput.header.tag=Tag
+ReportGenerator.htmlOutput.header.comment=Comment
+ReportGenerator.htmlOutput.header.timeModified=Modified Time
+ReportGenerator.htmlOutput.header.timeChanged=Changed Time
+ReportGenerator.htmlOutput.header.timeAccessed=Accessed Time
+ReportGenerator.htmlOutput.header.timeCreated=Created Time
+ReportGenerator.htmlOutput.header.size=Size (Bytes)
+ReportGenerator.htmlOutput.header.hash=Hash
+ReportGenerator.thumbnailTable.name=Tagged Images
+ReportGenerator.thumbnailTable.desc=Contains thumbnails of images that are associated with tagged files and results.
+ReportGenerator.writeKwHits.userSrchs=User Searches
+ReportGenerator.progress.processingList=Now processing {0} ({1})...
+ReportGenerator.artTableColHdr.url=URL
+ReportGenerator.artTableColHdr.title=Title
+ReportGenerator.artTableColHdr.dateCreated=Date Created
+ReportGenerator.artTableColHdr.program=Program
+ReportGenerator.artTableColHdr.urlDomainDecoded=URL Domain
+ReportGenerator.artTableColHdr.srcFile=Source File
+ReportGenerator.artTableColHdr.dateTime=Date/Time
+ReportGenerator.artTableColHdr.name=Name
+ReportGenerator.artTableColHdr.value=Value
+ReportGenerator.artTableColHdr.dateAccessed=Date Accessed
+ReportGenerator.artTableColHdr.referrer=Referrer
+ReportGenerator.artTableColHdr.dest=Destination
+ReportGenerator.artTableColHdr.sourceUrl=Source URL
+ReportGenerator.artTableColHdr.path=Path
+ReportGenerator.artTableColHdr.progName=Program Name
+ReportGenerator.artTableColHdr.instDateTime=Install Date/Time
+ReportGenerator.artTableColHdr.preview=Preview
+ReportGenerator.artTableColHdr.file=File
+ReportGenerator.artTableColHdr.size=Size
+ReportGenerator.artTableColHdr.deviceId=Device ID
+ReportGenerator.artTableColHdr.text=Text
+ReportGenerator.artTableColHdr.domain=Domain
+ReportGenerator.artTableColHdr.dateTaken=Date Taken
+ReportGenerator.artTableColHdr.devManufacturer=Device Manufacturer
+ReportGenerator.artTableColHdr.devMake=Device Make
+ReportGenerator.artTableColHdr.devModel=Device Model
+ReportGenerator.artTableColHdr.latitude=Latitude
+ReportGenerator.artTableColHdr.longitude=Longitude
+ReportGenerator.artTableColHdr.latitudeStart=Starting Latitude
+ReportGenerator.artTableColHdr.longitudeStart=Starting Longitude
+ReportGenerator.artTableColHdr.latitudeEnd=Ending Latitude
+ReportGenerator.artTableColHdr.longitudeEnd=Ending Longitude
+ReportGenerator.artTableColHdr.associatedArtifact=Associated Artifact
+ReportGenerator.artTableColHdr.count=Count
+ReportGenerator.artTableColHdr.personName=Person Name
+ReportGenerator.artTableColHdr.phoneNumber=Phone Number
+ReportGenerator.artTableColHdr.phoneNumHome=Phone Number (Home)
+ReportGenerator.artTableColHdr.phoneNumOffice=Phone Number (Office)
+ReportGenerator.artTableColHdr.phoneNumMobile=Phone Number (Mobile)
+ReportGenerator.artTableColHdr.email=Email
+ReportGenerator.artTableColHdr.msgType=Message Type
+ReportGenerator.artTableColHdr.direction=Direction
+ReportGenerator.artTableColHdr.readStatus=Read Status
+ReportGenerator.artTableColHdr.fromPhoneNum=From Phone Number
+ReportGenerator.artTableColHdr.fromEmail=From Email
+ReportGenerator.artTableColHdr.toPhoneNum=To Phone Number
+ReportGenerator.artTableColHdr.toEmail=To Email
+ReportGenerator.artTableColHdr.subject=Subject
+ReportGenerator.artTableColHdr.tskEmailTo=E-Mail To
+ReportGenerator.artTableColHdr.tskEmailCc=E-Mail CC
+ReportGenerator.artTableColHdr.tskEmailBcc=E-Mail BCC
+ReportGenerator.artTableColHdr.tskEmailFrom=E-Mail From
+ReportGenerator.artTableColHdr.tskMsgId=Message ID
+ReportGenerator.artTableColHdr.tskDateTimeRcvd=Date Received
+ReportGenerator.artTableColHdr.tskDateTimeSent=Date Sent
+ReportGenerator.artTableColHdr.tskSubject=Subject
+ReportGenerator.artTableColHdr.tskSetName=Set Name
+ReportGenerator.artTableColHdr.tskInterestingFilesCategory=Rule
+ReportGenerator.artTableColHdr.tskGpsRouteCategory=Category
+ReportGenerator.artTableColHdr.tskPath=Path
+ReportGenerator.artTableColHdr.calendarEntryType=Calendar Entry Type
+ReportGenerator.artTableColHdr.description=Description
+ReportGenerator.artTableColHdr.startDateTime=Start Date/Time
+ReportGenerator.artTableColHdr.endDateTime=End Date/Time
+ReportGenerator.artTableColHdr.location=Location
+ReportGenerator.artTableColHdr.shortCut=Short Cut
+ReportGenerator.artTableColHdr.deviceName=Device Name
+ReportGenerator.artTableColHdr.deviceAddress=Device Address
+ReportGenerator.artTableColHdr.altitude=Altitude
+ReportGenerator.artTableColHdr.locationAddress=Location Address
+ReportGenerator.artTableColHdr.category=Category
+ReportGenerator.artTableColHdr.userId=User ID
+ReportGenerator.artTableColHdr.userName=User Name
+ReportGenerator.artTableColHdr.password=Password
+ReportGenerator.artTableColHdr.appName=App Name
+ReportGenerator.artTableColHdr.appPath=App Path
+ReportGenerator.artTableColHdr.replytoAddress=ReplyTo Address
+ReportGenerator.artTableColHdr.mailServer=Mail Server
+ReportGenerator.artTableColHdr.tags=Tags
+ReportGenerator.artTableColHdr.localPath=Local path
+ReportGenerator.artTableColHdr.remotePath=Remote path
+ReportGenerator.errors.reportErrorTitle=Error generating report
+ReportGenerator.errors.reportErrorText=Error generating report: 
+ReportProgressDialog.progress.queuing=Queuing...
+ReportProgressDialog.initPathLabel.noFile=<html><u>No report file</u></html>
+ReportProgressDialog.start.cancelButton.text=Cancel
+ReportProgressDialog.start.progress.text=Starting report...
+ReportProgressDialog.complete.processLbl.text=Complete
+ReportProgressDialog.complete.processLb2.text=Completed with error
+ReportProgressDialog.complete.cancelButton.text=Complete
+ReportProgressDialog.cancel.cancelButton.toolTipText=Canceled
+ReportProgressDialog.cancel.procLbl.text=Canceled
+ReportVisualPanel1.getName.text=Select and Configure Report Modules
+ReportVisualPanel2.getName.text=Configure Report
+ReportWizardAction.actionName.text=Generate Report
+ReportWizardAction.reportWiz.title=Generate Report
+ReportWizardAction.toolBarButton.text=Generate Report
+ReportWizardFileOptionsPanel.finishButton.text=Finish
+ReportWizardFileOptionsVisualPanel.getName.text=Configure File Report
+ReportWizardPanel1.nextButton.text=Next >
+ReportWizardPanel1.finishButton.text=Finish
+ReportWizardPanel2.finishButton.text=Finish
+ReportWizardPanel2.nextButton.text=Next >
+ReportGenerator.artTableColHdr.extension.text=Extension
+ReportGenerator.artTableColHdr.mimeType.text=MIME Type
+ReportGenerator.artTableColHdr.processorArchitecture.text=Processor Architecture
+ReportGenerator.artTableColHdr.osName.text=Operating System Name
+ReportGenerator.artTableColHdr.osInstallDate.text=Install Date
+ReportGenerator.errList.failedMakeRptFolder=Failed to make report folder, may be unable to generate reports.
+ReportGenerator.notifyErr.errsDuringRptGen=Errors during report generation:
+ReportGenerator.errList.failedGetAllTagsArtifacts=Failed get all possible tag names and artifact types.
+ReportGenerator.errList.noReportSettings=Report settings have not been configured.
+ReportGenerator.errList.failedGetContentTags=Failed to get content tags.
+ReportGenerator.errList.failedGetBBArtifactTags=Failed to get blackboard artifact tags.
+ReportGenerator.errList.errGetContentFromBBArtifact=Error while getting content from a blackboard artifact to report on.
+ReportGenerator.errList.failedGetBBAttribs=Failed to get Blackboard Attributes when generating report.
+ReportGenerator.errList.failedGetBBArtifacts=Failed to get Blackboard Artifacts when generating report.
+ReportGenerator.errList.failedQueryKWLists=Failed to query keyword lists.
+ReportGenerator.errList.failedGetAbstractFileByID=Failed to get Abstract File by ID.
+ReportGenerator.errList.failedQueryKWs=Failed to query keywords.
+ReportGenerator.errList.failedQueryHashsetLists=Failed to query hashset lists.
+ReportGenerator.errList.failedGetAbstractFileFromID=Failed to get Abstract File from ID.
+ReportGenerator.errList.failedQueryHashsetHits=Failed to query hashsets hits.
+ReportGenerator.errList.coreExceptionWhileGenRptRow=Core exception while generating row data for artifact report.
+CreatePortableCasePanel.selectAllButton.text=Select All
+CreatePortableCasePanel.deselectAllButton.text=Deselect All
+CreatePortableCasePanel.outputFolderTextField.text=jTextField1
+CreatePortableCasePanel.chooseOutputFolderButton.text=Choose folder
+CreatePortableCasePanel.jLabel1.text=Export files tagged as:
+CreatePortableCasePanel.jLabel2.text=Select output folder:
+CreatePortableCasePanel.errorLabel.text_1=Windows only
+ReportWizardPortableCaseOptionsVisualPanel.getName.title=Choose Portable Case settings
+TableReportGenerator.StatusColumn.Header=Review Status
diff --git a/Core/src/org/sleuthkit/autopsy/report/infrastructure/Bundle_ja.properties b/Core/src/org/sleuthkit/autopsy/report/infrastructure/Bundle_ja.properties
new file mode 100755
index 0000000000..88d1470d98
--- /dev/null
+++ b/Core/src/org/sleuthkit/autopsy/report/infrastructure/Bundle_ja.properties
@@ -0,0 +1,177 @@
+CTL_ReportWizardAction=\u30ec\u30dd\u30fc\u30c8\u3092\u5b9f\u884c
+ReportWizardFileOptionsVisualPanel.selectAllButton.text=\u5168\u3066\u9078\u629e
+ReportWizardFileOptionsVisualPanel.jLabel1.text=\u30d5\u30a1\u30a4\u30eb\u30ec\u30dd\u30fc\u30c8\u306b\u542b\u3081\u308b\u30a2\u30a4\u30c6\u30e0\u3092\u9078\u629e\u3057\u3066\u4e0b\u3055\u3044\uff1a
+ReportWizardFileOptionsVisualPanel.deselectAllButton.text=\u5168\u3066\u9078\u629e\u89e3\u9664
+ReportProgressDialog.pathLabel.text=\u30d1\u30b9\u30e9\u30d9\u30eb
+ReportProgressDialog.reportLabel.text=\u30ec\u30dd\u30fc\u30c8\u30e9\u30d9\u30eb
+ReportProgressDialog.statusMessageLabel.text=\u30d7\u30ed\u30bb\u30b7\u30f3\u30b0\u30e9\u30d9\u30eb
+ReportProgressDialog.separationLabel.text=:
+ReportGenerationPanel.closeButton.text=\u9589\u3058\u308b
+ReportGenerationPanel.cancelButton.actionCommand=\u30ad\u30e3\u30f3\u30bb\u30eb
+ReportGenerationPanel.cancelButton.text=\u30ad\u30e3\u30f3\u30bb\u30eb
+ReportVisualPanel2.allResultsRadioButton.text=\u5168\u3066\u306e\u7d50\u679c
+ReportVisualPanel2.advancedButton.text=\u30c7\u30fc\u30bf\u30bf\u30a4\u30d7
+ReportVisualPanel2.deselectAllButton.text=\u5168\u3066\u9078\u629e\u89e3\u9664
+ReportVisualPanel2.selectAllButton.text=\u5168\u3066\u9078\u629e
+ReportVisualPanel2.dataLabel.text=\u3069\u306e\u30c7\u30fc\u30bf\u306b\u3064\u3044\u3066\u30ec\u30dd\u30fc\u30c8\u3059\u308b\u304b\u9078\u629e\u3057\u3066\u4e0b\u3055\u3044\uff1a
+ReportVisualPanel1.reportModulesLabel.text=\u30ec\u30dd\u30fc\u30c8\u30e2\u30b8\u30e5\u30fc\u30eb\uff1a
+ArtifactSelectionDialog.deselectAllButton.text=\u5168\u3066\u9078\u629e\u89e3\u9664
+ArtifactSelectionDialog.selectAllButton.text=\u5168\u3066\u9078\u629e
+ArtifactSelectionDialog.titleLabel.text=\u3069\u306e\u30a2\u30fc\u30c6\u30a3\u30d5\u30a1\u30af\u30c8\u306b\u3064\u3044\u3066\u30ec\u30dd\u30fc\u30c8\u3059\u308b\u304b\u9078\u629e\u3057\u3066\u4e0b\u3055\u3044\uff1a
+ArtifactSelectionDialog.okButton.text=OK
+ReportGenerationPanel.titleLabel.text=\u30ec\u30dd\u30fc\u30c8\u751f\u6210\u30d7\u30ed\u30b0\u30ec\u30b9
+ArtifactSelectionDialog.dlgTitle.text=\u30a2\u30c9\u30d0\u30f3\u30b9\u30a2\u30fc\u30c6\u30a3\u30d5\u30a1\u30af\u30c8\u9078\u629e
+ReportGenerationPanel.confDlg.sureToClose.msg=\u3053\u306e\u30c0\u30a4\u30a2\u30ed\u30b0\u3092\u672c\u5f53\u306b\u9589\u3058\u307e\u3059\u304b\uff1f\n\u5168\u3066\u306e\u30ec\u30dd\u30fc\u30c8\u304c\u30ad\u30e3\u30f3\u30bb\u30eb\u3055\u308c\u307e\u3059\u3002
+ReportGenerationPanel.confDlg.title.closing=\u9589\u3058\u3066\u3044\u307e\u3059
+ReportGenerator.displayProgress.title.text=\u30ec\u30dd\u30fc\u30c8\u751f\u6210\u30d7\u30ed\u30b0\u30ec\u30b9\u2026
+ReportGenerator.progress.queryingDb.text=\u30c7\u30fc\u30bf\u30d9\u30fc\u30b9\u306e\u30af\u30a8\u30ea\u3092\u5b9f\u884c\u4e2d\u2026
+ReportGenerator.progress.processingFile.text={0}\u3092\u51e6\u7406\u4e2d
+ReportGenerator.artifactTable.taggedResults.text=\u6b21\u306e\u4e2d\u306e\u4e00\u3064\u3067\u30bf\u30b0\u3055\u308c\u305f\u7d50\u679c\u304c\u542b\u307e\u308c\u3066\u3044\u307e\u3059\uff1a
+ReportGenerator.progress.processing={0}\u3092\u51e6\u7406\u4e2d\u2026
+ReportGenerator.msgShow.skippingArtType.title=\u30a2\u30fc\u30c6\u30a3\u30d5\u30a1\u30af\u30c8\u30bf\u30a4\u30d7{0}\u3092\u30ec\u30dd\u30fc\u30c8\u3067\u30b9\u30ad\u30c3\u30d7\u3057\u3066\u3044\u307e\u3059
+ReportGenerator.msgShow.skippingArtType.msg=\u30ec\u30dd\u30fc\u30c8\u751f\u6210\u3059\u308b\u306e\u306b\u4e0d\u660e\u306a\u30b3\u30e9\u30e0
+ReportGenerator.msgShow.skippingArtRow.title=\u30bf\u30a4\u30d7{0}\u306e\u30a2\u30fc\u30c6\u30a3\u30d5\u30a1\u30af\u30c8\u884c\u3092\u30ec\u30dd\u30fc\u30c8\u3067\u30b9\u30ad\u30c3\u30d7\u3057\u3066\u3044\u307e\u3059
+ReportGenerator.msgShow.skippingArtRow.msg=\u30ec\u30dd\u30fc\u30c8\u751f\u6210\u3059\u308b\u306e\u306b\u4e0d\u660e\u306a\u30b3\u30e9\u30e0
+ReportGenerator.makeContTagTab.taggedFiles.msg=\u306e\u4e2d\u306e\u4e00\u3064\u3067\u30bf\u30b0\u3055\u308c\u305f\u7d50\u679c\u304c\u542b\u307e\u308c\u3066\u3044\u307e\u3059\uff1a
+ReportGenerator.makeBbArtTagTab.taggedRes.msg=\u3053\u306e\u30ec\u30dd\u30fc\u30c8\u306b\u306f\u6b21\u3067\u30bf\u30b0\u3055\u308c\u305f\u7d50\u679c\u3057\u304b\u542b\u307e\u308c\u307e\u305b\u3093\uff1a
+ReportGenerator.tagTable.header.resultType=\u7d50\u679c\u30bf\u30a4\u30d7
+ReportGenerator.tagTable.header.tag=\u30bf\u30b0
+ReportGenerator.tagTable.header.comment=\u30b3\u30e1\u30f3\u30c8
+ReportGenerator.tagTable.header.srcFile=\u30bd\u30fc\u30b9\u30d5\u30a1\u30a4\u30eb
+ReportGenerator.progress.createdThumb.text=\u30b5\u30e0\u30cd\u30a4\u30eb\u3092\u4f5c\u6210\u4e2d\u2026
+ReportGenerator.thumbnailTable.name=\u30b5\u30e0\u30cd\u30a4\u30eb
+ReportGenerator.thumbnailTable.desc=\u30bf\u30b0\u3055\u308c\u305f\u30d5\u30a1\u30a4\u30eb\u3084\u7d50\u679c\u306b\u95a2\u9023\u3059\u308b\u30a4\u30e1\u30fc\u30b8\u306e\u30b5\u30e0\u30cd\u30a4\u30eb\u304c\u542b\u307e\u308c\u307e\u3059\u3002
+ReportGenerator.writeKwHits.userSrchs=\u30e6\u30fc\u30b6\u691c\u7d22
+ReportGenerator.progress.processingList={0} ({1})\u3092\u51e6\u7406\u4e2d\u2026
+ReportGenerator.artTableColHdr.url=URL
+ReportGenerator.artTableColHdr.title=\u30bf\u30a4\u30c8\u30eb
+ReportGenerator.artTableColHdr.dateCreated=\u4f5c\u6210\u65e5\u4ed8
+ReportGenerator.artTableColHdr.program=\u30d7\u30ed\u30b0\u30e9\u30e0
+ReportGenerator.artTableColHdr.srcFile=\u30bd\u30fc\u30b9\u30d5\u30a1\u30a4\u30eb
+ReportGenerator.artTableColHdr.dateTime=\u65e5\u4ed8\uff0f\u6642\u523b
+ReportGenerator.artTableColHdr.name=\u540d\u524d
+ReportGenerator.artTableColHdr.value=\u30d0\u30ea\u30e5\u30fc
+ReportGenerator.artTableColHdr.dateAccessed=\u30a2\u30af\u30bb\u30b9\u65e5\u4ed8
+ReportGenerator.artTableColHdr.referrer=\u30ea\u30d5\u30a1\u30e9
+ReportGenerator.artTableColHdr.dest=\u30c7\u30b9\u30c6\u30a3\u30cd\u30fc\u30b7\u30e7\u30f3
+ReportGenerator.artTableColHdr.sourceUrl=\u30bd\u30fc\u30b9URL
+ReportGenerator.artTableColHdr.path=\u30d1\u30b9
+ReportGenerator.artTableColHdr.progName=\u30d7\u30ed\u30b0\u30e9\u30e0\u540d
+ReportGenerator.artTableColHdr.instDateTime=\u30a4\u30f3\u30b9\u30c8\u30fc\u30eb\u65e5\u4ed8\uff0f\u6642\u523b
+ReportGenerator.artTableColHdr.preview=\u30d7\u30ec\u30d3\u30e5\u30fc
+ReportGenerator.artTableColHdr.file=\u30d5\u30a1\u30a4\u30eb
+ReportGenerator.artTableColHdr.size=\u30b5\u30a4\u30ba
+ReportGenerator.artTableColHdr.deviceId=\u6a5f\u5668ID
+ReportGenerator.artTableColHdr.text=\u30c6\u30ad\u30b9\u30c8
+ReportGenerator.artTableColHdr.domain=\u30c9\u30e1\u30a4\u30f3
+ReportGenerator.artTableColHdr.devManufacturer=\u6a5f\u5668\u30e1\u30fc\u30ab\u30fc
+ReportGenerator.artTableColHdr.devModel=\u6a5f\u5668\u30e2\u30c7\u30eb
+ReportGenerator.artTableColHdr.personName=\u4eba\u540d
+ReportGenerator.artTableColHdr.phoneNumber=\u96fb\u8a71\u756a\u53f7
+ReportGenerator.artTableColHdr.phoneNumHome=\u96fb\u8a71\u756a\u53f7\uff08\u81ea\u5b85\uff09
+ReportGenerator.artTableColHdr.phoneNumOffice=\u96fb\u8a71\u756a\u53f7\uff08\u4f1a\u793e\uff09
+ReportGenerator.artTableColHdr.phoneNumMobile=\u96fb\u8a71\u756a\u53f7\uff08\u643a\u5e2f\uff09
+ReportGenerator.artTableColHdr.email=Email
+ReportGenerator.artTableColHdr.msgType=\u30e1\u30c3\u30bb\u30fc\u30b8\u30bf\u30a4\u30d7
+ReportGenerator.artTableColHdr.latitude=\u7def\u5ea6
+ReportGenerator.artTableColHdr.longitude=\u7d4c\u5ea6
+ReportGenerator.artTableColHdr.dateTaken=\u64ae\u5f71\u65e5\u4ed8
+ReportGenerator.artTableColHdr.subject=\u30b5\u30d6\u30b8\u30a7\u30af\u30c8
+ReportGenerator.artTableColHdr.calendarEntryType=\u30ab\u30ec\u30f3\u30c0\u30fc\u30a8\u30f3\u30c8\u30ea\u30bf\u30a4\u30d7
+ReportGenerator.artTableColHdr.description=\u8aac\u660e
+ReportGenerator.artTableColHdr.startDateTime=\u958b\u59cb\u65e5\u4ed8\uff0f\u6642\u523b
+ReportGenerator.artTableColHdr.shortCut=\u30b7\u30e7\u30fc\u30c8\u30ab\u30c3\u30c8
+ReportGenerator.artTableColHdr.endDateTime=\u4fee\u4e86\u65e5\u4ed8\uff0f\u6642\u523b
+ReportGenerator.artTableColHdr.location=\u30ed\u30b1\u30fc\u30b7\u30e7\u30f3
+ReportGenerator.artTableColHdr.deviceName=\u6a5f\u5668\u540d
+ReportGenerator.artTableColHdr.deviceAddress=\u6a5f\u5668\u30a2\u30c9\u30ec\u30b9
+ReportGenerator.artTableColHdr.altitude=\u6a19\u9ad8
+ReportGenerator.artTableColHdr.locationAddress=\u30ed\u30b1\u30fc\u30b7\u30e7\u30f3\u30a2\u30c9\u30ec\u30b9
+ReportGenerator.artTableColHdr.category=\u30ab\u30c6\u30b4\u30ea\u30fc
+ReportGenerator.artTableColHdr.userId=\u30e6\u30fc\u30b6ID
+ReportGenerator.artTableColHdr.password=\u30d1\u30b9\u30ef\u30fc\u30c9
+ReportGenerator.artTableColHdr.replytoAddress=\u8fd4\u4fe1\u30a2\u30c9\u30ec\u30b9
+ReportGenerator.artTableColHdr.mailServer=\u30e1\u30fc\u30eb\u30b5\u30fc\u30d0
+ReportGenerator.artTableColHdr.tags=\u30bf\u30b0
+ReportProgressPanel.start.cancelButton.text=\u30ad\u30e3\u30f3\u30bb\u30eb
+ReportProgressPanel.complete.processLbl.text=\u5b8c\u4e86
+ReportProgressPanel.complete.cancelButton.text=\u5b8c\u4e86
+ReportProgressPanel.cancel.cancelButton.toolTipText=\u30ad\u30e3\u30f3\u30bb\u30eb\u3055\u308c\u307e\u3057\u305f
+ReportWizardAction.actionName.text=\u30ec\u30dd\u30fc\u30c8\u3092\u751f\u6210
+ReportWizardAction.reportWiz.title=\u30ec\u30dd\u30fc\u30c8\u3092\u751f\u6210
+ReportWizardAction.toolBarButton.text=\u30ec\u30dd\u30fc\u30c8\u3092\u751f\u6210
+ReportWizardPanel1.nextButton.text=\u6b21 >
+ReportWizardPanel2.nextButton.text=\u6b21 >
+ReportGenerator.artTableColHdr.direction=\u65b9\u5411
+ReportGenerator.artTableColHdr.fromEmail=\u9001\u4fe1\u5143E\u30e1\u30fc\u30eb
+ReportGenerator.artTableColHdr.toEmail=\u9001\u4fe1\u5148E\u30e1\u30fc\u30eb
+ReportGenerator.artTableColHdr.fromPhoneNum=\u767a\u4fe1\u8005\u96fb\u8a71\u756a\u53f7
+ReportGenerator.artTableColHdr.toPhoneNum=\u7740\u4fe1\u8005\u96fb\u8a71\u756a\u53f7
+ReportGenerator.artTableColHdr.appName=\u30a2\u30d7\u30ea\u30b1\u30fc\u30b7\u30e7\u30f3\u540d
+ReportGenerator.artTableColHdr.appPath=\u30a2\u30d7\u30ea\u30b1\u30fc\u30b7\u30e7\u30f3\u30d1\u30b9
+ReportProgressPanel.progress.queuing=\u30ad\u30e5\u30fc\u30a4\u30f3\u30b0\u2026
+ReportProgressPanel.initPathLabel.noFile=<html><u>\u30ec\u30dd\u30fc\u30c8\u30d5\u30a1\u30a4\u30eb\u7121\u3057</u></html>
+ReportProgressPanel.start.progress.text=\u30ec\u30dd\u30fc\u30c8\u958b\u59cb\u4e2d\u2026
+ReportProgressPanel.cancel.procLbl.text=\u30ad\u30e3\u30f3\u30bb\u30eb\u3055\u308c\u307e\u3057\u305f
+ReportVisualPanel1.getName.text=\u30ec\u30dd\u30fc\u30c8\u30e2\u30b8\u30e5\u30fc\u30eb\u306e\u9078\u629e\u304a\u3088\u3073\u8a2d\u5b9a
+ReportVisualPanel2.getName.text=\u30a2\u30fc\u30c6\u30a3\u30d5\u30a1\u30af\u30c8\u30ec\u30dd\u30fc\u30c8\u3092\u8a2d\u5b9a
+ReportWizardFileOptionsPanel.finishButton.text=\u7d42\u4e86
+ReportWizardFileOptionsVisualPanel.getName.text=\u30d5\u30a1\u30a4\u30eb\u30ec\u30dd\u30fc\u30c8\u3092\u8a2d\u5b9a
+ReportWizardPanel1.finishButton.text=\u7d42\u4e86
+ReportWizardPanel2.finishButton.text=\u7d42\u4e86
+ReportGenerator.errors.reportErrorTitle=\u30ec\u30dd\u30fc\u30c8\u751f\u6210\u4e2d\u306b\u30a8\u30e9\u30fc\u304c\u767a\u751f\u3057\u307e\u3057\u305f
+ReportGenerator.errors.reportErrorText=\u30ec\u30dd\u30fc\u30c8\u751f\u6210\u4e2d\u306b\u30a8\u30e9\u30fc\u304c\u767a\u751f\u3057\u307e\u3057\u305f\uff1a
+ReportGenerator.artTableColHdr.extension.text=\u62e1\u5f35\u5b50
+ReportGenerator.artTableColHdr.mimeType.text=MIME\u30bf\u30a4\u30d7
+ReportGenerator.artTableColHdr.associatedArtifact=\u95a2\u4fc2\u3059\u308b\u30a2\u30fc\u30c6\u30a3\u30d5\u30a1\u30af\u30c8
+ReportGenerator.artTableColHdr.count=\u30ab\u30a6\u30f3\u30c8
+ReportGenerator.artTableColHdr.devMake=\u6a5f\u5668\u578b\u540d
+ReportGenerator.artTableColHdr.latitudeEnd=\u5230\u7740\u7def\u5ea6
+ReportGenerator.artTableColHdr.latitudeStart=\u51fa\u767a\u7def\u5ea6
+ReportGenerator.artTableColHdr.localPath=\u30ed\u30fc\u30ab\u30eb\u30d1\u30b9
+ReportGenerator.artTableColHdr.longitudeEnd=\u5230\u7740\u7d4c\u5ea6
+ReportGenerator.artTableColHdr.longitudeStart=\u51fa\u767a\u7d4c\u5ea6
+ReportGenerator.artTableColHdr.osInstallDate.text=\u30a4\u30f3\u30b9\u30c8\u30fc\u30eb\u65e5\u4ed8
+ReportGenerator.artTableColHdr.osName.text=\u30aa\u30da\u30ec\u30fc\u30c6\u30a3\u30f3\u30b0\u30b7\u30b9\u30c6\u30e0\u540d
+ReportGenerator.artTableColHdr.processorArchitecture.text=\u30d7\u30ed\u30bb\u30c3\u30b5\u30a2\u30fc\u30ad\u30c6\u30af\u30c1\u30e3
+ReportGenerator.artTableColHdr.readStatus=\u8aad\u307f\u53d6\u308a\u4e2d\u30b9\u30c6\u30fc\u30bf\u30b9
+ReportGenerator.artTableColHdr.remotePath=\u30ea\u30e2\u30fc\u30c8\u30d1\u30b9
+ReportGenerator.artTableColHdr.tskDateTimeRcvd=\u53d7\u4fe1\u65e5
+ReportGenerator.artTableColHdr.tskDateTimeSent=\u9001\u4fe1\u65e5
+ReportGenerator.artTableColHdr.tskEmailBcc=E-Mail BCC
+ReportGenerator.artTableColHdr.tskEmailCc=E-Mail CC
+ReportGenerator.artTableColHdr.tskEmailFrom=E-Mail\u9001\u4fe1\u5143
+ReportGenerator.artTableColHdr.tskEmailTo=E-Mail\u9001\u4fe1\u5148
+ReportGenerator.artTableColHdr.tskGpsRouteCategory=\u30ab\u30c6\u30b4\u30ea
+ReportGenerator.artTableColHdr.tskInterestingFilesCategory=\u30eb\u30fc\u30eb
+ReportGenerator.artTableColHdr.tskMsgId=\u30e1\u30c3\u30bb\u30fc\u30b8ID
+ReportGenerator.artTableColHdr.tskPath=\u30d1\u30b9
+ReportGenerator.artTableColHdr.tskSetName=\u30bb\u30c3\u30c8\u540d
+ReportGenerator.artTableColHdr.tskSubject=\u30b5\u30d6\u30b8\u30a7\u30af\u30c8
+ReportGenerator.artTableColHdr.urlDomainDecoded=URL\u30c9\u30e1\u30a4\u30f3
+ReportGenerator.artTableColHdr.userName=\u30e6\u30fc\u30b6\u540d
+ReportGenerator.errList.coreExceptionWhileGenRptRow=\u30a2\u30fc\u30c6\u30a3\u30d5\u30a1\u30af\u30c8\u30ec\u30dd\u30fc\u30c8\u7528\u30ed\u30fc\u30c7\u30fc\u30bf\u306e\u751f\u6210\u4e2d\u306b\u30b3\u30a2\u30a8\u30af\u30bb\u30d7\u30b7\u30e7\u30f3\uff08\u4f8b\u5916\uff09\u304c\u691c\u51fa\u3055\u308c\u307e\u3057\u305f
+ReportGenerator.errList.errGetContentFromBBArtifact=Blackboard\u30a2\u30fc\u30c6\u30a3\u30d5\u30a1\u30af\u30c8\u304b\u3089\u30ec\u30dd\u30fc\u30c8\u7528\u306e\u30b3\u30f3\u30c6\u30f3\u30c4\u3092\u53d6\u5f97\u4e2d\u306b\u30a8\u30e9\u30fc\u304c\u767a\u751f\u3057\u307e\u3057\u305f\u3002
+ReportGenerator.errList.failedGetAbstractFileByID=ID\u306b\u57fa\u3065\u304d\u30a2\u30d6\u30b9\u30c8\u30e9\u30af\u30c8\u30d5\u30a1\u30a4\u30eb\u3092\u53d6\u5f97\u3059\u308b\u306e\u3092\u5931\u6557\u3057\u307e\u3057\u305f
+ReportGenerator.errList.failedGetBBArtifacts=\u30ec\u30dd\u30fc\u30c8\u751f\u6210\u4e2d\u306bBlackboard\u30a2\u30fc\u30c6\u30a3\u30d5\u30a1\u30af\u30c8\u306e\u53d6\u5f97\u306b\u5931\u6557\u3057\u307e\u3057\u305f\u3002
+ReportGenerator.errList.failedGetBBArtifactTags=Blackboard\u30a2\u30fc\u30c6\u30a3\u30d5\u30a1\u30af\u30c8\u30bf\u30b0\u306e\u53d6\u5f97\u306b\u5931\u6557\u3057\u307e\u3057\u305f\u3002
+ReportGenerator.errList.failedGetBBAttribs=\u30ec\u30dd\u30fc\u30c8\u751f\u6210\u4e2d\u306bBlackboard\u5c5e\u6027\u306e\u53d6\u5f97\u306b\u5931\u6557\u3057\u307e\u3057\u305f\u3002
+ReportGenerator.errList.failedGetContentTags=\u30b3\u30f3\u30c6\u30f3\u30c4\u30bf\u30b0\u306e\u53d6\u5f97\u306b\u5931\u6557\u3057\u307e\u3057\u305f\u3002
+ReportGenerator.errList.failedMakeRptFolder=\u30ec\u30dd\u30fc\u30c8\u30d5\u30a9\u30eb\u30c0\u306e\u4f5c\u6210\u306b\u5931\u6557\u3057\u307e\u3057\u305f\u3002\u30ec\u30dd\u30fc\u30c8\u751f\u6210\u304c\u3067\u304d\u306a\u3044\u304b\u3082\u3057\u308c\u307e\u305b\u3093\u3002
+ReportGenerator.errList.failedQueryHashsetHits=\u30cf\u30c3\u30b7\u30e5\u30bb\u30c3\u30c8\u30d2\u30c3\u30c8\u3092\u30af\u30a8\u30ea\u3059\u308b\u306e\u306b\u5931\u6557\u3057\u307e\u3057\u305f\u3002
+ReportGenerator.errList.failedQueryHashsetLists=\u30cf\u30c3\u30b7\u30e5\u30bb\u30c3\u30c8\u30ea\u30b9\u30c8\u3092\u30af\u30a8\u30ea\u3059\u308b\u306e\u306b\u5931\u6557\u3057\u307e\u3057\u305f\u3002
+ReportGenerator.errList.failedQueryKWLists=\u30ad\u30fc\u30ef\u30fc\u30c9\u30ea\u30b9\u30c8\u3092\u30af\u30a8\u30ea\u3059\u308b\u306e\u306b\u5931\u6557\u3057\u307e\u3057\u305f\u3002
+ReportGenerator.errList.failedQueryKWs=\u30ad\u30fc\u30ef\u30fc\u30c9\u3092\u30af\u30a8\u30ea\u3059\u308b\u306e\u306b\u5931\u6557\u3057\u307e\u3057\u305f\u3002
+ReportGenerator.htmlOutput.header.comment=\u30b3\u30e1\u30f3\u30c8
+ReportGenerator.htmlOutput.header.file=\u30d5\u30a1\u30a4\u30eb
+ReportGenerator.htmlOutput.header.hash=\u30cf\u30c3\u30b7\u30e5
+ReportGenerator.htmlOutput.header.size=\u30b5\u30a4\u30ba\uff08\u30d0\u30a4\u30c8\uff09
+ReportGenerator.htmlOutput.header.tag=\u30bf\u30b0
+ReportGenerator.htmlOutput.header.timeAccessed=\u30a2\u30af\u30bb\u30b9\u65e5\u6642
+ReportGenerator.htmlOutput.header.timeCreated=\u4f5c\u6210\u65e5\u6642
+ReportGenerator.htmlOutput.header.timeModified=\u4fee\u6b63\u65e5\u6642
+ReportGenerator.notifyErr.errsDuringRptGen=\u30ec\u30dd\u30fc\u30c8\u751f\u6210\u4e2d\u306e\u30a8\u30e9\u30fc\uff1a
+ReportGenerator.errList.failedGetAbstractFileFromID=ID\u306b\u57fa\u3065\u304d\u30a2\u30d6\u30b9\u30c8\u30e9\u30af\u30c8\u30d5\u30a1\u30a4\u30eb\u3092\u53d6\u5f97\u3059\u308b\u306e\u3092\u5931\u6557\u3057\u307e\u3057\u305f
+ReportVisualPanel1.invalidModuleWarning=\u7121\u52b9\u306a\u30ec\u30dd\u30fc\u30c8\u30e2\u30b8\u30e5\u30fc\u30eb({0})\u306b\u906d\u9047\u3057\u307e\u3057\u305f
+ReportGenerationPanel.confDlg.cancelReport.msg=\u672c\u5f53\u306b\u30ec\u30dd\u30fc\u30c8\u3092\u30ad\u30e3\u30f3\u30bb\u30eb\u3057\u307e\u3059\u304b\uff1f
+ReportProgressPanel.complete.processLb2.text=\u5b8c\u4e86\u3057\u307e\u3057\u305f\u304c\u3001\u30a8\u30e9\u30fc\u304c\u767a\u751f\u3057\u307e\u3057\u305f
diff --git a/Core/src/org/sleuthkit/autopsy/report/FileReportModule.java b/Core/src/org/sleuthkit/autopsy/report/infrastructure/FileReportModule.java
similarity index 89%
rename from Core/src/org/sleuthkit/autopsy/report/FileReportModule.java
rename to Core/src/org/sleuthkit/autopsy/report/infrastructure/FileReportModule.java
index cff2ab6a4f..f3ef9de415 100644
--- a/Core/src/org/sleuthkit/autopsy/report/FileReportModule.java
+++ b/Core/src/org/sleuthkit/autopsy/report/infrastructure/FileReportModule.java
@@ -16,8 +16,10 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.sleuthkit.autopsy.report;
+package org.sleuthkit.autopsy.report.infrastructure;
 
+import org.sleuthkit.autopsy.report.modules.FileReportDataTypes;
+import org.sleuthkit.autopsy.report.ReportModule;
 import java.util.List;
 import org.sleuthkit.datamodel.AbstractFile;
 
@@ -26,7 +28,7 @@ import org.sleuthkit.datamodel.AbstractFile;
  *
  * @author jwallace
  */
-interface FileReportModule extends ReportModule {
+public interface FileReportModule extends ReportModule {
 
     /**
      * Initialize the report which will be stored at the given path.
diff --git a/Core/src/org/sleuthkit/autopsy/report/FileReportSettings.java b/Core/src/org/sleuthkit/autopsy/report/infrastructure/FileReportSettings.java
similarity index 93%
rename from Core/src/org/sleuthkit/autopsy/report/FileReportSettings.java
rename to Core/src/org/sleuthkit/autopsy/report/infrastructure/FileReportSettings.java
index e70ef7608f..e665463b34 100755
--- a/Core/src/org/sleuthkit/autopsy/report/FileReportSettings.java
+++ b/Core/src/org/sleuthkit/autopsy/report/infrastructure/FileReportSettings.java
@@ -16,8 +16,9 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.sleuthkit.autopsy.report;
+package org.sleuthkit.autopsy.report.infrastructure;
 
+import org.sleuthkit.autopsy.report.modules.FileReportDataTypes;
 import java.io.Serializable;
 import java.util.HashMap;
 import java.util.Map;
diff --git a/Core/src/org/sleuthkit/autopsy/report/PortableCaseInterestingItemsListPanel.form b/Core/src/org/sleuthkit/autopsy/report/infrastructure/PortableCaseInterestingItemsListPanel.form
similarity index 90%
rename from Core/src/org/sleuthkit/autopsy/report/PortableCaseInterestingItemsListPanel.form
rename to Core/src/org/sleuthkit/autopsy/report/infrastructure/PortableCaseInterestingItemsListPanel.form
index 6deb5d86d2..9fbe01c27b 100644
--- a/Core/src/org/sleuthkit/autopsy/report/PortableCaseInterestingItemsListPanel.form
+++ b/Core/src/org/sleuthkit/autopsy/report/infrastructure/PortableCaseInterestingItemsListPanel.form
@@ -90,14 +90,14 @@
         <Component class="javax.swing.JLabel" name="descLabel">
           <Properties>
             <Property name="text" type="java.lang.String" editor="org.netbeans.modules.i18n.form.FormI18nStringEditor">
-              <ResourceString bundle="org/sleuthkit/autopsy/report/Bundle.properties" key="PortableCaseInterestingItemsListPanel.descLabel.text" replaceFormat="org.openide.util.NbBundle.getMessage({sourceFileName}.class, &quot;{key}&quot;)"/>
+              <ResourceString bundle="org/sleuthkit/autopsy/report/infrastructure/Bundle.properties" key="PortableCaseInterestingItemsListPanel.descLabel.text" replaceFormat="org.openide.util.NbBundle.getMessage({sourceFileName}.class, &quot;{key}&quot;)"/>
             </Property>
           </Properties>
         </Component>
         <Component class="javax.swing.JButton" name="selectButton">
           <Properties>
             <Property name="text" type="java.lang.String" editor="org.netbeans.modules.i18n.form.FormI18nStringEditor">
-              <ResourceString bundle="org/sleuthkit/autopsy/report/Bundle.properties" key="PortableCaseInterestingItemsListPanel.selectButton.text" replaceFormat="org.openide.util.NbBundle.getMessage({sourceFileName}.class, &quot;{key}&quot;)"/>
+              <ResourceString bundle="org/sleuthkit/autopsy/report/infrastructure/Bundle.properties" key="PortableCaseInterestingItemsListPanel.selectButton.text" replaceFormat="org.openide.util.NbBundle.getMessage({sourceFileName}.class, &quot;{key}&quot;)"/>
             </Property>
             <Property name="maximumSize" type="java.awt.Dimension" editor="org.netbeans.beaninfo.editors.DimensionEditor">
               <Dimension value="[87, 23]"/>
@@ -113,7 +113,7 @@
         <Component class="javax.swing.JButton" name="deselectButton">
           <Properties>
             <Property name="text" type="java.lang.String" editor="org.netbeans.modules.i18n.form.FormI18nStringEditor">
-              <ResourceString bundle="org/sleuthkit/autopsy/report/Bundle.properties" key="PortableCaseInterestingItemsListPanel.deselectButton.text" replaceFormat="org.openide.util.NbBundle.getMessage({sourceFileName}.class, &quot;{key}&quot;)"/>
+              <ResourceString bundle="org/sleuthkit/autopsy/report/infrastructure/Bundle.properties" key="PortableCaseInterestingItemsListPanel.deselectButton.text" replaceFormat="org.openide.util.NbBundle.getMessage({sourceFileName}.class, &quot;{key}&quot;)"/>
             </Property>
           </Properties>
           <Events>
@@ -123,7 +123,7 @@
         <Component class="javax.swing.JCheckBox" name="jAllSetsCheckBox">
           <Properties>
             <Property name="text" type="java.lang.String" editor="org.netbeans.modules.i18n.form.FormI18nStringEditor">
-              <ResourceString bundle="org/sleuthkit/autopsy/report/Bundle.properties" key="PortableCaseInterestingItemsListPanel.jAllSetsCheckBox.text" replaceFormat="org.openide.util.NbBundle.getMessage({sourceFileName}.class, &quot;{key}&quot;)"/>
+              <ResourceString bundle="org/sleuthkit/autopsy/report/infrastructure/Bundle.properties" key="PortableCaseInterestingItemsListPanel.jAllSetsCheckBox.text" replaceFormat="org.openide.util.NbBundle.getMessage({sourceFileName}.class, &quot;{key}&quot;)"/>
             </Property>
           </Properties>
           <Events>
diff --git a/Core/src/org/sleuthkit/autopsy/report/PortableCaseInterestingItemsListPanel.java b/Core/src/org/sleuthkit/autopsy/report/infrastructure/PortableCaseInterestingItemsListPanel.java
similarity index 98%
rename from Core/src/org/sleuthkit/autopsy/report/PortableCaseInterestingItemsListPanel.java
rename to Core/src/org/sleuthkit/autopsy/report/infrastructure/PortableCaseInterestingItemsListPanel.java
index 18be7e8934..01cabf1c01 100644
--- a/Core/src/org/sleuthkit/autopsy/report/PortableCaseInterestingItemsListPanel.java
+++ b/Core/src/org/sleuthkit/autopsy/report/infrastructure/PortableCaseInterestingItemsListPanel.java
@@ -16,8 +16,9 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.sleuthkit.autopsy.report;
+package org.sleuthkit.autopsy.report.infrastructure;
 
+import org.sleuthkit.autopsy.report.modules.PortableCaseReportModuleSettings;
 import java.awt.Component;
 import java.awt.event.ItemEvent;
 import java.awt.event.ItemListener;
@@ -40,7 +41,7 @@ import org.openide.util.NbBundle;
 import org.sleuthkit.autopsy.casemodule.Case;
 import org.sleuthkit.autopsy.casemodule.NoCurrentCaseException;
 import org.sleuthkit.autopsy.coreutils.Logger;
-import org.sleuthkit.autopsy.report.PortableCaseReportModule.GetInterestingItemSetNamesCallback;
+import org.sleuthkit.autopsy.report.modules.PortableCaseReportModule.GetInterestingItemSetNamesCallback;
 import org.sleuthkit.datamodel.BlackboardArtifact;
 import org.sleuthkit.datamodel.BlackboardAttribute;
 import org.sleuthkit.datamodel.TskCoreException;
diff --git a/Core/src/org/sleuthkit/autopsy/report/PortableCaseTagsListPanel.form b/Core/src/org/sleuthkit/autopsy/report/infrastructure/PortableCaseTagsListPanel.form
similarity index 90%
rename from Core/src/org/sleuthkit/autopsy/report/PortableCaseTagsListPanel.form
rename to Core/src/org/sleuthkit/autopsy/report/infrastructure/PortableCaseTagsListPanel.form
index 5ed74d5489..0757f14756 100644
--- a/Core/src/org/sleuthkit/autopsy/report/PortableCaseTagsListPanel.form
+++ b/Core/src/org/sleuthkit/autopsy/report/infrastructure/PortableCaseTagsListPanel.form
@@ -89,14 +89,14 @@
         <Component class="javax.swing.JLabel" name="descLabel">
           <Properties>
             <Property name="text" type="java.lang.String" editor="org.netbeans.modules.i18n.form.FormI18nStringEditor">
-              <ResourceString bundle="org/sleuthkit/autopsy/report/Bundle.properties" key="PortableCaseTagsListPanel.descLabel.text" replaceFormat="org.openide.util.NbBundle.getMessage({sourceFileName}.class, &quot;{key}&quot;)"/>
+              <ResourceString bundle="org/sleuthkit/autopsy/report/infrastructure/Bundle.properties" key="PortableCaseTagsListPanel.descLabel.text" replaceFormat="org.openide.util.NbBundle.getMessage({sourceFileName}.class, &quot;{key}&quot;)"/>
             </Property>
           </Properties>
         </Component>
         <Component class="javax.swing.JButton" name="selectButton">
           <Properties>
             <Property name="text" type="java.lang.String" editor="org.netbeans.modules.i18n.form.FormI18nStringEditor">
-              <ResourceString bundle="org/sleuthkit/autopsy/report/Bundle.properties" key="PortableCaseTagsListPanel.selectButton.text" replaceFormat="org.openide.util.NbBundle.getMessage({sourceFileName}.class, &quot;{key}&quot;)"/>
+              <ResourceString bundle="org/sleuthkit/autopsy/report/infrastructure/Bundle.properties" key="PortableCaseTagsListPanel.selectButton.text" replaceFormat="org.openide.util.NbBundle.getMessage({sourceFileName}.class, &quot;{key}&quot;)"/>
             </Property>
             <Property name="maximumSize" type="java.awt.Dimension" editor="org.netbeans.beaninfo.editors.DimensionEditor">
               <Dimension value="[87, 23]"/>
@@ -112,7 +112,7 @@
         <Component class="javax.swing.JButton" name="deselectButton">
           <Properties>
             <Property name="text" type="java.lang.String" editor="org.netbeans.modules.i18n.form.FormI18nStringEditor">
-              <ResourceString bundle="org/sleuthkit/autopsy/report/Bundle.properties" key="PortableCaseTagsListPanel.deselectButton.text" replaceFormat="org.openide.util.NbBundle.getMessage({sourceFileName}.class, &quot;{key}&quot;)"/>
+              <ResourceString bundle="org/sleuthkit/autopsy/report/infrastructure/Bundle.properties" key="PortableCaseTagsListPanel.deselectButton.text" replaceFormat="org.openide.util.NbBundle.getMessage({sourceFileName}.class, &quot;{key}&quot;)"/>
             </Property>
           </Properties>
           <Events>
@@ -122,7 +122,7 @@
         <Component class="javax.swing.JCheckBox" name="jAllTagsCheckBox">
           <Properties>
             <Property name="text" type="java.lang.String" editor="org.netbeans.modules.i18n.form.FormI18nStringEditor">
-              <ResourceString bundle="org/sleuthkit/autopsy/report/Bundle.properties" key="PortableCaseTagsListPanel.jAllTagsCheckBox.text" replaceFormat="org.openide.util.NbBundle.getMessage({sourceFileName}.class, &quot;{key}&quot;)"/>
+              <ResourceString bundle="org/sleuthkit/autopsy/report/infrastructure/Bundle.properties" key="PortableCaseTagsListPanel.jAllTagsCheckBox.text" replaceFormat="org.openide.util.NbBundle.getMessage({sourceFileName}.class, &quot;{key}&quot;)"/>
             </Property>
           </Properties>
           <Events>
diff --git a/Core/src/org/sleuthkit/autopsy/report/PortableCaseTagsListPanel.java b/Core/src/org/sleuthkit/autopsy/report/infrastructure/PortableCaseTagsListPanel.java
similarity index 99%
rename from Core/src/org/sleuthkit/autopsy/report/PortableCaseTagsListPanel.java
rename to Core/src/org/sleuthkit/autopsy/report/infrastructure/PortableCaseTagsListPanel.java
index 834c091801..01c5e4a591 100644
--- a/Core/src/org/sleuthkit/autopsy/report/PortableCaseTagsListPanel.java
+++ b/Core/src/org/sleuthkit/autopsy/report/infrastructure/PortableCaseTagsListPanel.java
@@ -16,8 +16,9 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.sleuthkit.autopsy.report;
+package org.sleuthkit.autopsy.report.infrastructure;
 
+import org.sleuthkit.autopsy.report.modules.PortableCaseReportModuleSettings;
 import java.awt.Component;
 import java.awt.event.ItemEvent;
 import java.awt.event.ItemListener;
diff --git a/Core/src/org/sleuthkit/autopsy/report/ReportBrandingProviderI.java b/Core/src/org/sleuthkit/autopsy/report/infrastructure/ReportBrandingProviderI.java
similarity index 95%
rename from Core/src/org/sleuthkit/autopsy/report/ReportBrandingProviderI.java
rename to Core/src/org/sleuthkit/autopsy/report/infrastructure/ReportBrandingProviderI.java
index 7c495823e5..3e6dcbd5e3 100644
--- a/Core/src/org/sleuthkit/autopsy/report/ReportBrandingProviderI.java
+++ b/Core/src/org/sleuthkit/autopsy/report/infrastructure/ReportBrandingProviderI.java
@@ -16,12 +16,12 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.sleuthkit.autopsy.report;
+package org.sleuthkit.autopsy.report.infrastructure;
 
 /**
  * Interface to implement by reports to add on custom branding, logos, etc
  */
-interface ReportBrandingProviderI {
+public interface ReportBrandingProviderI {
 
     /**
      * Get the generator logo path on the local disk (previously set or
diff --git a/Core/src/org/sleuthkit/autopsy/report/ReportConfigException.java b/Core/src/org/sleuthkit/autopsy/report/infrastructure/ReportConfigException.java
similarity index 96%
rename from Core/src/org/sleuthkit/autopsy/report/ReportConfigException.java
rename to Core/src/org/sleuthkit/autopsy/report/infrastructure/ReportConfigException.java
index 4d97f5b957..4966182860 100755
--- a/Core/src/org/sleuthkit/autopsy/report/ReportConfigException.java
+++ b/Core/src/org/sleuthkit/autopsy/report/infrastructure/ReportConfigException.java
@@ -16,7 +16,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.sleuthkit.autopsy.report;
+package org.sleuthkit.autopsy.report.infrastructure;
 
 /**
  * Instances of this exception class are thrown when there is an error during
diff --git a/Core/src/org/sleuthkit/autopsy/report/ReportGenerationPanel.form b/Core/src/org/sleuthkit/autopsy/report/infrastructure/ReportGenerationPanel.form
similarity index 88%
rename from Core/src/org/sleuthkit/autopsy/report/ReportGenerationPanel.form
rename to Core/src/org/sleuthkit/autopsy/report/infrastructure/ReportGenerationPanel.form
index 86a4cbe37d..b76dccdb54 100644
--- a/Core/src/org/sleuthkit/autopsy/report/ReportGenerationPanel.form
+++ b/Core/src/org/sleuthkit/autopsy/report/infrastructure/ReportGenerationPanel.form
@@ -65,7 +65,7 @@
           </FontInfo>
         </Property>
         <Property name="text" type="java.lang.String" editor="org.netbeans.modules.i18n.form.FormI18nStringEditor">
-          <ResourceString bundle="org/sleuthkit/autopsy/report/Bundle.properties" key="ReportGenerationPanel.closeButton.text" replaceFormat="org.openide.util.NbBundle.getMessage({sourceFileName}.class, &quot;{key}&quot;)"/>
+          <ResourceString bundle="org/sleuthkit/autopsy/report/infrastructure/Bundle.properties" key="ReportGenerationPanel.closeButton.text" replaceFormat="org.openide.util.NbBundle.getMessage({sourceFileName}.class, &quot;{key}&quot;)"/>
         </Property>
       </Properties>
       <Events>
@@ -80,10 +80,10 @@
           </FontInfo>
         </Property>
         <Property name="text" type="java.lang.String" editor="org.netbeans.modules.i18n.form.FormI18nStringEditor">
-          <ResourceString bundle="org/sleuthkit/autopsy/report/Bundle.properties" key="ReportGenerationPanel.cancelButton.text" replaceFormat="org.openide.util.NbBundle.getMessage({sourceFileName}.class, &quot;{key}&quot;)"/>
+          <ResourceString bundle="org/sleuthkit/autopsy/report/infrastructure/Bundle.properties" key="ReportGenerationPanel.cancelButton.text" replaceFormat="org.openide.util.NbBundle.getMessage({sourceFileName}.class, &quot;{key}&quot;)"/>
         </Property>
         <Property name="actionCommand" type="java.lang.String" editor="org.netbeans.modules.i18n.form.FormI18nStringEditor">
-          <ResourceString bundle="org/sleuthkit/autopsy/report/Bundle.properties" key="ReportGenerationPanel.cancelButton.actionCommand" replaceFormat="org.openide.util.NbBundle.getMessage({sourceFileName}.class, &quot;{key}&quot;)"/>
+          <ResourceString bundle="org/sleuthkit/autopsy/report/infrastructure/Bundle.properties" key="ReportGenerationPanel.cancelButton.actionCommand" replaceFormat="org.openide.util.NbBundle.getMessage({sourceFileName}.class, &quot;{key}&quot;)"/>
         </Property>
       </Properties>
       <Events>
diff --git a/Core/src/org/sleuthkit/autopsy/report/ReportGenerationPanel.java b/Core/src/org/sleuthkit/autopsy/report/infrastructure/ReportGenerationPanel.java
similarity index 98%
rename from Core/src/org/sleuthkit/autopsy/report/ReportGenerationPanel.java
rename to Core/src/org/sleuthkit/autopsy/report/infrastructure/ReportGenerationPanel.java
index a3d661cff3..ec391d6d93 100644
--- a/Core/src/org/sleuthkit/autopsy/report/ReportGenerationPanel.java
+++ b/Core/src/org/sleuthkit/autopsy/report/infrastructure/ReportGenerationPanel.java
@@ -16,7 +16,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.sleuthkit.autopsy.report;
+package org.sleuthkit.autopsy.report.infrastructure;
 
 import java.awt.*;
 import java.awt.event.ActionListener;
@@ -25,6 +25,7 @@ import javax.swing.Box;
 import javax.swing.JOptionPane;
 import javax.swing.SwingUtilities;
 import org.openide.util.NbBundle;
+import org.sleuthkit.autopsy.report.ReportProgressPanel;
 import org.sleuthkit.autopsy.report.ReportProgressPanel.ReportStatus;
 
 /**
diff --git a/Core/src/org/sleuthkit/autopsy/report/ReportGenerator.java b/Core/src/org/sleuthkit/autopsy/report/infrastructure/ReportGenerator.java
similarity index 96%
rename from Core/src/org/sleuthkit/autopsy/report/ReportGenerator.java
rename to Core/src/org/sleuthkit/autopsy/report/infrastructure/ReportGenerator.java
index 625a6a233b..49f9801df7 100644
--- a/Core/src/org/sleuthkit/autopsy/report/ReportGenerator.java
+++ b/Core/src/org/sleuthkit/autopsy/report/infrastructure/ReportGenerator.java
@@ -16,8 +16,15 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.sleuthkit.autopsy.report;
+package org.sleuthkit.autopsy.report.infrastructure;
 
+import org.sleuthkit.autopsy.report.modules.FileReportDataTypes;
+import org.sleuthkit.autopsy.report.modules.PortableCaseReportModuleSettings;
+import org.sleuthkit.autopsy.report.modules.PortableCaseReportModule;
+import org.sleuthkit.autopsy.report.NoReportModuleSettings;
+import org.sleuthkit.autopsy.report.ReportModule;
+import org.sleuthkit.autopsy.report.ReportModuleSettings;
+import org.sleuthkit.autopsy.report.GeneralReportModule;
 import java.awt.event.ActionEvent;
 import java.awt.event.ActionListener;
 import java.awt.event.WindowAdapter;
@@ -42,6 +49,7 @@ import org.openide.windows.WindowManager;
 import org.sleuthkit.autopsy.casemodule.Case;
 import org.sleuthkit.autopsy.casemodule.NoCurrentCaseException;
 import org.sleuthkit.autopsy.coreutils.Logger;
+import org.sleuthkit.autopsy.report.ReportProgressPanel;
 import org.sleuthkit.autopsy.report.ReportProgressPanel.ReportStatus;
 import org.sleuthkit.datamodel.AbstractFile;
 import org.sleuthkit.datamodel.SleuthkitCase;
@@ -59,7 +67,7 @@ public class ReportGenerator {
 
     private final String configName;
 
-    static final String REPORTS_DIR = "Reports"; //NON-NLS
+    public static final String REPORTS_DIR = "Reports"; //NON-NLS
 
     private List<String> errorList;
 
diff --git a/Core/src/org/sleuthkit/autopsy/report/ReportModuleConfig.java b/Core/src/org/sleuthkit/autopsy/report/infrastructure/ReportModuleConfig.java
similarity index 93%
rename from Core/src/org/sleuthkit/autopsy/report/ReportModuleConfig.java
rename to Core/src/org/sleuthkit/autopsy/report/infrastructure/ReportModuleConfig.java
index 5b7d12fde6..644a7bf220 100755
--- a/Core/src/org/sleuthkit/autopsy/report/ReportModuleConfig.java
+++ b/Core/src/org/sleuthkit/autopsy/report/infrastructure/ReportModuleConfig.java
@@ -16,8 +16,11 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.sleuthkit.autopsy.report;
+package org.sleuthkit.autopsy.report.infrastructure;
 
+import org.sleuthkit.autopsy.report.NoReportModuleSettings;
+import org.sleuthkit.autopsy.report.ReportModule;
+import org.sleuthkit.autopsy.report.ReportModuleSettings;
 import java.io.Serializable;
 
 /**
diff --git a/Core/src/org/sleuthkit/autopsy/report/ReportModuleLoader.java b/Core/src/org/sleuthkit/autopsy/report/infrastructure/ReportModuleLoader.java
similarity index 95%
rename from Core/src/org/sleuthkit/autopsy/report/ReportModuleLoader.java
rename to Core/src/org/sleuthkit/autopsy/report/infrastructure/ReportModuleLoader.java
index f772761eac..f62c7945b7 100755
--- a/Core/src/org/sleuthkit/autopsy/report/ReportModuleLoader.java
+++ b/Core/src/org/sleuthkit/autopsy/report/infrastructure/ReportModuleLoader.java
@@ -16,8 +16,9 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.sleuthkit.autopsy.report;
+package org.sleuthkit.autopsy.report.infrastructure;
 
+import org.sleuthkit.autopsy.report.GeneralReportModule;
 import java.util.ArrayList;
 import java.util.List;
 import org.openide.util.Lookup;
diff --git a/Core/src/org/sleuthkit/autopsy/report/ReportProgressDialog.form b/Core/src/org/sleuthkit/autopsy/report/infrastructure/ReportProgressDialog.form
similarity index 86%
rename from Core/src/org/sleuthkit/autopsy/report/ReportProgressDialog.form
rename to Core/src/org/sleuthkit/autopsy/report/infrastructure/ReportProgressDialog.form
index 8979a5d188..08cd8ec3f4 100644
--- a/Core/src/org/sleuthkit/autopsy/report/ReportProgressDialog.form
+++ b/Core/src/org/sleuthkit/autopsy/report/infrastructure/ReportProgressDialog.form
@@ -79,7 +79,7 @@
           </FontInfo>
         </Property>
         <Property name="text" type="java.lang.String" editor="org.netbeans.modules.i18n.form.FormI18nStringEditor">
-          <ResourceString bundle="org/sleuthkit/autopsy/report/Bundle.properties" key="ReportProgressDialog.reportLabel.text" replaceFormat="org.openide.util.NbBundle.getMessage({sourceFileName}.class, &quot;{key}&quot;)"/>
+          <ResourceString bundle="org/sleuthkit/autopsy/report/infrastructure/Bundle.properties" key="ReportProgressDialog.reportLabel.text" replaceFormat="org.openide.util.NbBundle.getMessage({sourceFileName}.class, &quot;{key}&quot;)"/>
         </Property>
       </Properties>
     </Component>
@@ -91,7 +91,7 @@
           </FontInfo>
         </Property>
         <Property name="text" type="java.lang.String" editor="org.netbeans.modules.i18n.form.FormI18nStringEditor">
-          <ResourceString bundle="org/sleuthkit/autopsy/report/Bundle.properties" key="ReportProgressDialog.pathLabel.text" replaceFormat="org.openide.util.NbBundle.getMessage({sourceFileName}.class, &quot;{key}&quot;)"/>
+          <ResourceString bundle="org/sleuthkit/autopsy/report/infrastructure/Bundle.properties" key="ReportProgressDialog.pathLabel.text" replaceFormat="org.openide.util.NbBundle.getMessage({sourceFileName}.class, &quot;{key}&quot;)"/>
         </Property>
         <Property name="verticalAlignment" type="int" value="1"/>
       </Properties>
@@ -104,14 +104,14 @@
           </FontInfo>
         </Property>
         <Property name="text" type="java.lang.String" editor="org.netbeans.modules.i18n.form.FormI18nStringEditor">
-          <ResourceString bundle="org/sleuthkit/autopsy/report/Bundle.properties" key="ReportProgressDialog.separationLabel.text" replaceFormat="org.openide.util.NbBundle.getMessage({sourceFileName}.class, &quot;{key}&quot;)"/>
+          <ResourceString bundle="org/sleuthkit/autopsy/report/infrastructure/Bundle.properties" key="ReportProgressDialog.separationLabel.text" replaceFormat="org.openide.util.NbBundle.getMessage({sourceFileName}.class, &quot;{key}&quot;)"/>
         </Property>
       </Properties>
     </Component>
     <Component class="javax.swing.JLabel" name="statusMessageLabel">
       <Properties>
         <Property name="text" type="java.lang.String" editor="org.netbeans.modules.i18n.form.FormI18nStringEditor">
-          <ResourceString bundle="org/sleuthkit/autopsy/report/Bundle.properties" key="ReportProgressDialog.statusMessageLabel.text" replaceFormat="org.openide.util.NbBundle.getMessage({sourceFileName}.class, &quot;{key}&quot;)"/>
+          <ResourceString bundle="org/sleuthkit/autopsy/report/infrastructure/Bundle.properties" key="ReportProgressDialog.statusMessageLabel.text" replaceFormat="org.openide.util.NbBundle.getMessage({sourceFileName}.class, &quot;{key}&quot;)"/>
         </Property>
       </Properties>
     </Component>
diff --git a/Core/src/org/sleuthkit/autopsy/report/ReportProgressDialog.java b/Core/src/org/sleuthkit/autopsy/report/infrastructure/ReportProgressDialog.java
similarity index 98%
rename from Core/src/org/sleuthkit/autopsy/report/ReportProgressDialog.java
rename to Core/src/org/sleuthkit/autopsy/report/infrastructure/ReportProgressDialog.java
index face4174dd..d98c6b1056 100644
--- a/Core/src/org/sleuthkit/autopsy/report/ReportProgressDialog.java
+++ b/Core/src/org/sleuthkit/autopsy/report/infrastructure/ReportProgressDialog.java
@@ -16,7 +16,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.sleuthkit.autopsy.report;
+package org.sleuthkit.autopsy.report.infrastructure;
 
 import org.openide.util.NbBundle;
 import java.awt.Color;
@@ -29,12 +29,13 @@ import java.io.File;
 import java.io.IOException;
 import java.util.logging.Level;
 import org.sleuthkit.autopsy.coreutils.Logger;
+import org.sleuthkit.autopsy.report.ReportProgressPanel;
 
 /**
  * A panel used by a report generation module to show progress.
  */
 @SuppressWarnings("PMD.SingularField") // UI widgets cause lots of false positives
-public class ReportProgressDialog extends javax.swing.JPanel implements ReportProgressPanel {
+class ReportProgressDialog extends javax.swing.JPanel implements ReportProgressPanel {
 
     private static final long serialVersionUID = 1L;
     private static final Logger logger = Logger.getLogger(ReportProgressDialog.class.getName());
diff --git a/Core/src/org/sleuthkit/autopsy/report/ReportProgressLogger.java b/Core/src/org/sleuthkit/autopsy/report/infrastructure/ReportProgressLogger.java
similarity index 97%
rename from Core/src/org/sleuthkit/autopsy/report/ReportProgressLogger.java
rename to Core/src/org/sleuthkit/autopsy/report/infrastructure/ReportProgressLogger.java
index 5f0011b9d5..d37c63117a 100755
--- a/Core/src/org/sleuthkit/autopsy/report/ReportProgressLogger.java
+++ b/Core/src/org/sleuthkit/autopsy/report/infrastructure/ReportProgressLogger.java
@@ -16,10 +16,11 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.sleuthkit.autopsy.report;
+package org.sleuthkit.autopsy.report.infrastructure;
 
 import java.util.logging.Level;
 import org.sleuthkit.autopsy.coreutils.Logger;
+import org.sleuthkit.autopsy.report.ReportProgressPanel;
 
 /**
  * Writes progress and status messages to the application log.
diff --git a/Core/src/org/sleuthkit/autopsy/report/ReportVisualPanel1.form b/Core/src/org/sleuthkit/autopsy/report/infrastructure/ReportVisualPanel1.form
similarity index 96%
rename from Core/src/org/sleuthkit/autopsy/report/ReportVisualPanel1.form
rename to Core/src/org/sleuthkit/autopsy/report/infrastructure/ReportVisualPanel1.form
index 7ec90408ea..7728350704 100644
--- a/Core/src/org/sleuthkit/autopsy/report/ReportVisualPanel1.form
+++ b/Core/src/org/sleuthkit/autopsy/report/infrastructure/ReportVisualPanel1.form
@@ -59,7 +59,7 @@
     <Component class="javax.swing.JLabel" name="reportModulesLabel">
       <Properties>
         <Property name="text" type="java.lang.String" editor="org.netbeans.modules.i18n.form.FormI18nStringEditor">
-          <ResourceString bundle="org/sleuthkit/autopsy/report/Bundle.properties" key="ReportVisualPanel1.reportModulesLabel.text" replaceFormat="org.openide.util.NbBundle.getMessage({sourceFileName}.class, &quot;{key}&quot;)"/>
+          <ResourceString bundle="org/sleuthkit/autopsy/report/infrastructure/Bundle.properties" key="ReportVisualPanel1.reportModulesLabel.text" replaceFormat="org.openide.util.NbBundle.getMessage({sourceFileName}.class, &quot;{key}&quot;)"/>
         </Property>
       </Properties>
     </Component>
diff --git a/Core/src/org/sleuthkit/autopsy/report/ReportVisualPanel1.java b/Core/src/org/sleuthkit/autopsy/report/infrastructure/ReportVisualPanel1.java
similarity index 97%
rename from Core/src/org/sleuthkit/autopsy/report/ReportVisualPanel1.java
rename to Core/src/org/sleuthkit/autopsy/report/infrastructure/ReportVisualPanel1.java
index c7eaff63d4..3e6926298f 100644
--- a/Core/src/org/sleuthkit/autopsy/report/ReportVisualPanel1.java
+++ b/Core/src/org/sleuthkit/autopsy/report/infrastructure/ReportVisualPanel1.java
@@ -16,8 +16,13 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.sleuthkit.autopsy.report;
+package org.sleuthkit.autopsy.report.infrastructure;
 
+import org.sleuthkit.autopsy.report.modules.PortableCaseReportModule;
+import org.sleuthkit.autopsy.report.modules.ReportHTML;
+import org.sleuthkit.autopsy.report.ReportModule;
+import org.sleuthkit.autopsy.report.ReportModuleSettings;
+import org.sleuthkit.autopsy.report.GeneralReportModule;
 import java.awt.BorderLayout;
 import java.awt.Component;
 import java.util.ArrayList;
diff --git a/Core/src/org/sleuthkit/autopsy/report/ReportVisualPanel2.form b/Core/src/org/sleuthkit/autopsy/report/infrastructure/ReportVisualPanel2.form
similarity index 85%
rename from Core/src/org/sleuthkit/autopsy/report/ReportVisualPanel2.form
rename to Core/src/org/sleuthkit/autopsy/report/infrastructure/ReportVisualPanel2.form
index 1c704cf6cb..039ef97c70 100644
--- a/Core/src/org/sleuthkit/autopsy/report/ReportVisualPanel2.form
+++ b/Core/src/org/sleuthkit/autopsy/report/infrastructure/ReportVisualPanel2.form
@@ -86,7 +86,7 @@
           <ComponentRef name="optionsButtonGroup"/>
         </Property>
         <Property name="text" type="java.lang.String" editor="org.netbeans.modules.i18n.form.FormI18nStringEditor">
-          <ResourceString bundle="org/sleuthkit/autopsy/report/Bundle.properties" key="ReportVisualPanel2.specificTaggedResultsRadioButton.text" replaceFormat="org.openide.util.NbBundle.getMessage({sourceFileName}.class, &quot;{key}&quot;)"/>
+          <ResourceString bundle="org/sleuthkit/autopsy/report/infrastructure/Bundle.properties" key="ReportVisualPanel2.specificTaggedResultsRadioButton.text" replaceFormat="org.openide.util.NbBundle.getMessage({sourceFileName}.class, &quot;{key}&quot;)"/>
         </Property>
       </Properties>
     </Component>
@@ -96,7 +96,7 @@
           <ComponentRef name="optionsButtonGroup"/>
         </Property>
         <Property name="text" type="java.lang.String" editor="org.netbeans.modules.i18n.form.FormI18nStringEditor">
-          <ResourceString bundle="org/sleuthkit/autopsy/report/Bundle.properties" key="ReportVisualPanel2.allResultsRadioButton.text" replaceFormat="org.openide.util.NbBundle.getMessage({sourceFileName}.class, &quot;{key}&quot;)"/>
+          <ResourceString bundle="org/sleuthkit/autopsy/report/infrastructure/Bundle.properties" key="ReportVisualPanel2.allResultsRadioButton.text" replaceFormat="org.openide.util.NbBundle.getMessage({sourceFileName}.class, &quot;{key}&quot;)"/>
         </Property>
       </Properties>
       <Events>
@@ -106,14 +106,14 @@
     <Component class="javax.swing.JLabel" name="dataLabel">
       <Properties>
         <Property name="text" type="java.lang.String" editor="org.netbeans.modules.i18n.form.FormI18nStringEditor">
-          <ResourceString bundle="org/sleuthkit/autopsy/report/Bundle.properties" key="ReportVisualPanel2.dataLabel.text" replaceFormat="org.openide.util.NbBundle.getMessage({sourceFileName}.class, &quot;{key}&quot;)"/>
+          <ResourceString bundle="org/sleuthkit/autopsy/report/infrastructure/Bundle.properties" key="ReportVisualPanel2.dataLabel.text" replaceFormat="org.openide.util.NbBundle.getMessage({sourceFileName}.class, &quot;{key}&quot;)"/>
         </Property>
       </Properties>
     </Component>
     <Component class="javax.swing.JButton" name="selectAllButton">
       <Properties>
         <Property name="text" type="java.lang.String" editor="org.netbeans.modules.i18n.form.FormI18nStringEditor">
-          <ResourceString bundle="org/sleuthkit/autopsy/report/Bundle.properties" key="ReportVisualPanel2.selectAllButton.text" replaceFormat="org.openide.util.NbBundle.getMessage({sourceFileName}.class, &quot;{key}&quot;)"/>
+          <ResourceString bundle="org/sleuthkit/autopsy/report/infrastructure/Bundle.properties" key="ReportVisualPanel2.selectAllButton.text" replaceFormat="org.openide.util.NbBundle.getMessage({sourceFileName}.class, &quot;{key}&quot;)"/>
         </Property>
       </Properties>
       <Events>
@@ -123,7 +123,7 @@
     <Component class="javax.swing.JButton" name="deselectAllButton">
       <Properties>
         <Property name="text" type="java.lang.String" editor="org.netbeans.modules.i18n.form.FormI18nStringEditor">
-          <ResourceString bundle="org/sleuthkit/autopsy/report/Bundle.properties" key="ReportVisualPanel2.deselectAllButton.text" replaceFormat="org.openide.util.NbBundle.getMessage({sourceFileName}.class, &quot;{key}&quot;)"/>
+          <ResourceString bundle="org/sleuthkit/autopsy/report/infrastructure/Bundle.properties" key="ReportVisualPanel2.deselectAllButton.text" replaceFormat="org.openide.util.NbBundle.getMessage({sourceFileName}.class, &quot;{key}&quot;)"/>
         </Property>
       </Properties>
       <Events>
@@ -155,7 +155,7 @@
     <Component class="javax.swing.JButton" name="advancedButton">
       <Properties>
         <Property name="text" type="java.lang.String" editor="org.netbeans.modules.i18n.form.FormI18nStringEditor">
-          <ResourceString bundle="org/sleuthkit/autopsy/report/Bundle.properties" key="ReportVisualPanel2.advancedButton.text" replaceFormat="org.openide.util.NbBundle.getMessage({sourceFileName}.class, &quot;{key}&quot;)"/>
+          <ResourceString bundle="org/sleuthkit/autopsy/report/infrastructure/Bundle.properties" key="ReportVisualPanel2.advancedButton.text" replaceFormat="org.openide.util.NbBundle.getMessage({sourceFileName}.class, &quot;{key}&quot;)"/>
         </Property>
       </Properties>
       <Events>
@@ -168,7 +168,7 @@
           <ComponentRef name="optionsButtonGroup"/>
         </Property>
         <Property name="text" type="java.lang.String" editor="org.netbeans.modules.i18n.form.FormI18nStringEditor">
-          <ResourceString bundle="org/sleuthkit/autopsy/report/Bundle.properties" key="ReportVisualPanel2.allTaggedResultsRadioButton.text" replaceFormat="org.openide.util.NbBundle.getMessage({sourceFileName}.class, &quot;{key}&quot;)"/>
+          <ResourceString bundle="org/sleuthkit/autopsy/report/infrastructure/Bundle.properties" key="ReportVisualPanel2.allTaggedResultsRadioButton.text" replaceFormat="org.openide.util.NbBundle.getMessage({sourceFileName}.class, &quot;{key}&quot;)"/>
         </Property>
       </Properties>
       <Events>
diff --git a/Core/src/org/sleuthkit/autopsy/report/ReportVisualPanel2.java b/Core/src/org/sleuthkit/autopsy/report/infrastructure/ReportVisualPanel2.java
similarity index 99%
rename from Core/src/org/sleuthkit/autopsy/report/ReportVisualPanel2.java
rename to Core/src/org/sleuthkit/autopsy/report/infrastructure/ReportVisualPanel2.java
index c636314c5a..aa5c2ed59f 100644
--- a/Core/src/org/sleuthkit/autopsy/report/ReportVisualPanel2.java
+++ b/Core/src/org/sleuthkit/autopsy/report/infrastructure/ReportVisualPanel2.java
@@ -16,8 +16,9 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.sleuthkit.autopsy.report;
+package org.sleuthkit.autopsy.report.infrastructure;
 
+import org.sleuthkit.autopsy.report.infrastructure.TableReportSettings;
 import java.awt.Component;
 import java.awt.event.ItemEvent;
 import java.awt.event.ItemListener;
diff --git a/Core/src/org/sleuthkit/autopsy/report/ReportWizardAction.java b/Core/src/org/sleuthkit/autopsy/report/infrastructure/ReportWizardAction.java
similarity index 95%
rename from Core/src/org/sleuthkit/autopsy/report/ReportWizardAction.java
rename to Core/src/org/sleuthkit/autopsy/report/infrastructure/ReportWizardAction.java
index 331be72b55..0960839dcd 100644
--- a/Core/src/org/sleuthkit/autopsy/report/ReportWizardAction.java
+++ b/Core/src/org/sleuthkit/autopsy/report/infrastructure/ReportWizardAction.java
@@ -20,8 +20,10 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.sleuthkit.autopsy.report;
+package org.sleuthkit.autopsy.report.infrastructure;
 
+import org.sleuthkit.autopsy.report.modules.PortableCaseReportModuleSettings;
+import org.sleuthkit.autopsy.report.modules.PortableCaseReportModule;
 import java.awt.Component;
 import java.awt.event.ActionEvent;
 import java.awt.event.ActionListener;
@@ -48,7 +50,7 @@ import org.sleuthkit.autopsy.casemodule.Case;
 import org.sleuthkit.autopsy.core.RuntimeProperties;
 import org.sleuthkit.autopsy.coreutils.Logger;
 
-@ActionID(category = "Tools", id = "org.sleuthkit.autopsy.report.ReportWizardAction")
+@ActionID(category = "Tools", id = "org.sleuthkit.autopsy.report.infrastructure.ReportWizardAction")
 @ActionRegistration(displayName = "#CTL_ReportWizardAction", lazy = false)
 @ActionReferences(value = {
     @ActionReference(path = "Menu/Tools", position = 301, separatorAfter = 399)
@@ -165,7 +167,7 @@ public final class ReportWizardAction extends CallableSystemAction implements Pr
      */
     @Override
     public Component getToolbarPresenter() {
-        ImageIcon icon = new ImageIcon(getClass().getResource("images/btn_icon_generate_report.png")); //NON-NLS
+        ImageIcon icon = new ImageIcon(getClass().getResource("/org/sleuthkit/autopsy/report/images/btn_icon_generate_report.png")); //NON-NLS
         toolbarButton.setIcon(icon);
         toolbarButton.setText(NbBundle.getMessage(this.getClass(), "ReportWizardAction.toolBarButton.text"));
         return toolbarButton;
diff --git a/Core/src/org/sleuthkit/autopsy/report/ReportWizardFileOptionsPanel.java b/Core/src/org/sleuthkit/autopsy/report/infrastructure/ReportWizardFileOptionsPanel.java
similarity index 95%
rename from Core/src/org/sleuthkit/autopsy/report/ReportWizardFileOptionsPanel.java
rename to Core/src/org/sleuthkit/autopsy/report/infrastructure/ReportWizardFileOptionsPanel.java
index de95271485..56bf293c16 100644
--- a/Core/src/org/sleuthkit/autopsy/report/ReportWizardFileOptionsPanel.java
+++ b/Core/src/org/sleuthkit/autopsy/report/infrastructure/ReportWizardFileOptionsPanel.java
@@ -16,8 +16,9 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.sleuthkit.autopsy.report;
+package org.sleuthkit.autopsy.report.infrastructure;
 
+import org.sleuthkit.autopsy.report.infrastructure.FileReportSettings;
 import java.awt.event.ActionEvent;
 import java.awt.event.ActionListener;
 import javax.swing.JButton;
diff --git a/Core/src/org/sleuthkit/autopsy/report/ReportWizardFileOptionsVisualPanel.form b/Core/src/org/sleuthkit/autopsy/report/infrastructure/ReportWizardFileOptionsVisualPanel.form
similarity index 87%
rename from Core/src/org/sleuthkit/autopsy/report/ReportWizardFileOptionsVisualPanel.form
rename to Core/src/org/sleuthkit/autopsy/report/infrastructure/ReportWizardFileOptionsVisualPanel.form
index e7d1d1ce34..fe58752c5f 100644
--- a/Core/src/org/sleuthkit/autopsy/report/ReportWizardFileOptionsVisualPanel.form
+++ b/Core/src/org/sleuthkit/autopsy/report/infrastructure/ReportWizardFileOptionsVisualPanel.form
@@ -77,7 +77,7 @@
     <Component class="javax.swing.JButton" name="selectAllButton">
       <Properties>
         <Property name="text" type="java.lang.String" editor="org.netbeans.modules.i18n.form.FormI18nStringEditor">
-          <ResourceString bundle="org/sleuthkit/autopsy/report/Bundle.properties" key="ReportWizardFileOptionsVisualPanel.selectAllButton.text" replaceFormat="org.openide.util.NbBundle.getMessage({sourceFileName}.class, &quot;{key}&quot;)"/>
+          <ResourceString bundle="org/sleuthkit/autopsy/report/infrastructure/Bundle.properties" key="ReportWizardFileOptionsVisualPanel.selectAllButton.text" replaceFormat="org.openide.util.NbBundle.getMessage({sourceFileName}.class, &quot;{key}&quot;)"/>
         </Property>
       </Properties>
       <Events>
@@ -87,7 +87,7 @@
     <Component class="javax.swing.JButton" name="deselectAllButton">
       <Properties>
         <Property name="text" type="java.lang.String" editor="org.netbeans.modules.i18n.form.FormI18nStringEditor">
-          <ResourceString bundle="org/sleuthkit/autopsy/report/Bundle.properties" key="ReportWizardFileOptionsVisualPanel.deselectAllButton.text" replaceFormat="org.openide.util.NbBundle.getMessage({sourceFileName}.class, &quot;{key}&quot;)"/>
+          <ResourceString bundle="org/sleuthkit/autopsy/report/infrastructure/Bundle.properties" key="ReportWizardFileOptionsVisualPanel.deselectAllButton.text" replaceFormat="org.openide.util.NbBundle.getMessage({sourceFileName}.class, &quot;{key}&quot;)"/>
         </Property>
       </Properties>
       <Events>
@@ -97,7 +97,7 @@
     <Component class="javax.swing.JLabel" name="jLabel1">
       <Properties>
         <Property name="text" type="java.lang.String" editor="org.netbeans.modules.i18n.form.FormI18nStringEditor">
-          <ResourceString bundle="org/sleuthkit/autopsy/report/Bundle.properties" key="ReportWizardFileOptionsVisualPanel.jLabel1.text" replaceFormat="org.openide.util.NbBundle.getMessage({sourceFileName}.class, &quot;{key}&quot;)"/>
+          <ResourceString bundle="org/sleuthkit/autopsy/report/infrastructure/Bundle.properties" key="ReportWizardFileOptionsVisualPanel.jLabel1.text" replaceFormat="org.openide.util.NbBundle.getMessage({sourceFileName}.class, &quot;{key}&quot;)"/>
         </Property>
       </Properties>
     </Component>
diff --git a/Core/src/org/sleuthkit/autopsy/report/ReportWizardFileOptionsVisualPanel.java b/Core/src/org/sleuthkit/autopsy/report/infrastructure/ReportWizardFileOptionsVisualPanel.java
similarity index 98%
rename from Core/src/org/sleuthkit/autopsy/report/ReportWizardFileOptionsVisualPanel.java
rename to Core/src/org/sleuthkit/autopsy/report/infrastructure/ReportWizardFileOptionsVisualPanel.java
index 19edc56528..6d2cd657a4 100644
--- a/Core/src/org/sleuthkit/autopsy/report/ReportWizardFileOptionsVisualPanel.java
+++ b/Core/src/org/sleuthkit/autopsy/report/infrastructure/ReportWizardFileOptionsVisualPanel.java
@@ -16,8 +16,10 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.sleuthkit.autopsy.report;
+package org.sleuthkit.autopsy.report.infrastructure;
 
+import org.sleuthkit.autopsy.report.modules.FileReportDataTypes;
+import org.sleuthkit.autopsy.report.infrastructure.FileReportSettings;
 import java.awt.Component;
 import java.awt.event.MouseAdapter;
 import java.awt.event.MouseEvent;
diff --git a/Core/src/org/sleuthkit/autopsy/report/ReportWizardIterator.java b/Core/src/org/sleuthkit/autopsy/report/infrastructure/ReportWizardIterator.java
similarity index 96%
rename from Core/src/org/sleuthkit/autopsy/report/ReportWizardIterator.java
rename to Core/src/org/sleuthkit/autopsy/report/infrastructure/ReportWizardIterator.java
index 631c5a4ab3..d5b86e69ca 100644
--- a/Core/src/org/sleuthkit/autopsy/report/ReportWizardIterator.java
+++ b/Core/src/org/sleuthkit/autopsy/report/infrastructure/ReportWizardIterator.java
@@ -16,8 +16,11 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.sleuthkit.autopsy.report;
+package org.sleuthkit.autopsy.report.infrastructure;
 
+import org.sleuthkit.autopsy.report.infrastructure.ReportingConfigLoader;
+import org.sleuthkit.autopsy.report.infrastructure.ReportConfigException;
+import org.sleuthkit.autopsy.report.infrastructure.ReportingConfig;
 import java.awt.Component;
 import java.util.Arrays;
 import java.util.List;
diff --git a/Core/src/org/sleuthkit/autopsy/report/ReportWizardPanel1.java b/Core/src/org/sleuthkit/autopsy/report/infrastructure/ReportWizardPanel1.java
similarity index 96%
rename from Core/src/org/sleuthkit/autopsy/report/ReportWizardPanel1.java
rename to Core/src/org/sleuthkit/autopsy/report/infrastructure/ReportWizardPanel1.java
index a5d141b5e7..628284c8ea 100644
--- a/Core/src/org/sleuthkit/autopsy/report/ReportWizardPanel1.java
+++ b/Core/src/org/sleuthkit/autopsy/report/infrastructure/ReportWizardPanel1.java
@@ -16,8 +16,9 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.sleuthkit.autopsy.report;
+package org.sleuthkit.autopsy.report.infrastructure;
 
+import org.sleuthkit.autopsy.report.infrastructure.ReportModuleConfig;
 import java.awt.event.ActionEvent;
 import java.awt.event.ActionListener;
 import java.util.Map;
diff --git a/Core/src/org/sleuthkit/autopsy/report/ReportWizardPanel2.java b/Core/src/org/sleuthkit/autopsy/report/infrastructure/ReportWizardPanel2.java
similarity index 96%
rename from Core/src/org/sleuthkit/autopsy/report/ReportWizardPanel2.java
rename to Core/src/org/sleuthkit/autopsy/report/infrastructure/ReportWizardPanel2.java
index c7ed85c0cf..1435f7aa42 100644
--- a/Core/src/org/sleuthkit/autopsy/report/ReportWizardPanel2.java
+++ b/Core/src/org/sleuthkit/autopsy/report/infrastructure/ReportWizardPanel2.java
@@ -16,8 +16,9 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.sleuthkit.autopsy.report;
+package org.sleuthkit.autopsy.report.infrastructure;
 
+import org.sleuthkit.autopsy.report.infrastructure.TableReportSettings;
 import java.awt.event.ActionEvent;
 import java.awt.event.ActionListener;
 import javax.swing.JButton;
diff --git a/Core/src/org/sleuthkit/autopsy/report/ReportWizardPortableCaseOptionsPanel.java b/Core/src/org/sleuthkit/autopsy/report/infrastructure/ReportWizardPortableCaseOptionsPanel.java
similarity index 98%
rename from Core/src/org/sleuthkit/autopsy/report/ReportWizardPortableCaseOptionsPanel.java
rename to Core/src/org/sleuthkit/autopsy/report/infrastructure/ReportWizardPortableCaseOptionsPanel.java
index 2fbe656d58..f0263566e3 100644
--- a/Core/src/org/sleuthkit/autopsy/report/ReportWizardPortableCaseOptionsPanel.java
+++ b/Core/src/org/sleuthkit/autopsy/report/infrastructure/ReportWizardPortableCaseOptionsPanel.java
@@ -16,7 +16,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.sleuthkit.autopsy.report;
+package org.sleuthkit.autopsy.report.infrastructure;
 
 import java.awt.event.ActionEvent;
 import java.awt.event.ActionListener;
diff --git a/Core/src/org/sleuthkit/autopsy/report/ReportWizardPortableCaseOptionsVisualPanel.form b/Core/src/org/sleuthkit/autopsy/report/infrastructure/ReportWizardPortableCaseOptionsVisualPanel.form
similarity index 90%
rename from Core/src/org/sleuthkit/autopsy/report/ReportWizardPortableCaseOptionsVisualPanel.form
rename to Core/src/org/sleuthkit/autopsy/report/infrastructure/ReportWizardPortableCaseOptionsVisualPanel.form
index ed370c19b5..9359e187d4 100644
--- a/Core/src/org/sleuthkit/autopsy/report/ReportWizardPortableCaseOptionsVisualPanel.form
+++ b/Core/src/org/sleuthkit/autopsy/report/infrastructure/ReportWizardPortableCaseOptionsVisualPanel.form
@@ -76,10 +76,10 @@
         <Component class="javax.swing.JCheckBox" name="compressCheckbox">
           <Properties>
             <Property name="text" type="java.lang.String" editor="org.netbeans.modules.i18n.form.FormI18nStringEditor">
-              <ResourceString bundle="org/sleuthkit/autopsy/report/Bundle.properties" key="ReportWizardPortableCaseOptionsVisualPanel.compressCheckbox.text" replaceFormat="org.openide.util.NbBundle.getMessage({sourceFileName}.class, &quot;{key}&quot;)"/>
+              <ResourceString bundle="org/sleuthkit/autopsy/report/infrastructure/Bundle.properties" key="ReportWizardPortableCaseOptionsVisualPanel.compressCheckbox.text" replaceFormat="org.openide.util.NbBundle.getMessage({sourceFileName}.class, &quot;{key}&quot;)"/>
             </Property>
             <Property name="toolTipText" type="java.lang.String" editor="org.netbeans.modules.i18n.form.FormI18nStringEditor">
-              <ResourceString bundle="org/sleuthkit/autopsy/report/Bundle.properties" key="ReportWizardPortableCaseOptionsVisualPanel.compressCheckbox.toolTipText" replaceFormat="org.openide.util.NbBundle.getMessage({sourceFileName}.class, &quot;{key}&quot;)"/>
+              <ResourceString bundle="org/sleuthkit/autopsy/report/infrastructure/Bundle.properties" key="ReportWizardPortableCaseOptionsVisualPanel.compressCheckbox.toolTipText" replaceFormat="org.openide.util.NbBundle.getMessage({sourceFileName}.class, &quot;{key}&quot;)"/>
             </Property>
           </Properties>
           <Events>
@@ -92,7 +92,7 @@
               <Color blue="0" green="0" red="ff" type="rgb"/>
             </Property>
             <Property name="text" type="java.lang.String" editor="org.netbeans.modules.i18n.form.FormI18nStringEditor">
-              <ResourceString bundle="org/sleuthkit/autopsy/report/Bundle.properties" key="ReportWizardPortableCaseOptionsVisualPanel.errorLabel.text" replaceFormat="org.openide.util.NbBundle.getMessage({sourceFileName}.class, &quot;{key}&quot;)"/>
+              <ResourceString bundle="org/sleuthkit/autopsy/report/infrastructure/Bundle.properties" key="ReportWizardPortableCaseOptionsVisualPanel.errorLabel.text" replaceFormat="org.openide.util.NbBundle.getMessage({sourceFileName}.class, &quot;{key}&quot;)"/>
             </Property>
           </Properties>
         </Component>
diff --git a/Core/src/org/sleuthkit/autopsy/report/ReportWizardPortableCaseOptionsVisualPanel.java b/Core/src/org/sleuthkit/autopsy/report/infrastructure/ReportWizardPortableCaseOptionsVisualPanel.java
similarity index 96%
rename from Core/src/org/sleuthkit/autopsy/report/ReportWizardPortableCaseOptionsVisualPanel.java
rename to Core/src/org/sleuthkit/autopsy/report/infrastructure/ReportWizardPortableCaseOptionsVisualPanel.java
index f56ae7db1b..bc8ab94f22 100644
--- a/Core/src/org/sleuthkit/autopsy/report/ReportWizardPortableCaseOptionsVisualPanel.java
+++ b/Core/src/org/sleuthkit/autopsy/report/infrastructure/ReportWizardPortableCaseOptionsVisualPanel.java
@@ -16,13 +16,16 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.sleuthkit.autopsy.report;
+package org.sleuthkit.autopsy.report.infrastructure;
 
+import org.sleuthkit.autopsy.report.modules.PortableCaseReportModuleSettings;
+import org.sleuthkit.autopsy.report.modules.PortableCaseReportModule;
+import org.sleuthkit.autopsy.report.ReportModuleSettings;
 import java.awt.GridLayout;
 import java.util.Map;
 import org.openide.util.NbBundle;
 import org.sleuthkit.autopsy.coreutils.PlatformUtil;
-import org.sleuthkit.autopsy.report.PortableCaseReportModuleSettings.ChunkSize;
+import org.sleuthkit.autopsy.report.modules.PortableCaseReportModuleSettings.ChunkSize;
 
 /**
  * The UI portion of the Portable Case config panel
diff --git a/Core/src/org/sleuthkit/autopsy/report/ReportingConfig.java b/Core/src/org/sleuthkit/autopsy/report/infrastructure/ReportingConfig.java
similarity index 97%
rename from Core/src/org/sleuthkit/autopsy/report/ReportingConfig.java
rename to Core/src/org/sleuthkit/autopsy/report/infrastructure/ReportingConfig.java
index b6b9ebf154..dd04332b6d 100755
--- a/Core/src/org/sleuthkit/autopsy/report/ReportingConfig.java
+++ b/Core/src/org/sleuthkit/autopsy/report/infrastructure/ReportingConfig.java
@@ -16,7 +16,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.sleuthkit.autopsy.report;
+package org.sleuthkit.autopsy.report.infrastructure;
 
 import java.io.Serializable;
 import java.util.HashMap;
diff --git a/Core/src/org/sleuthkit/autopsy/report/ReportingConfigLoader.java b/Core/src/org/sleuthkit/autopsy/report/infrastructure/ReportingConfigLoader.java
similarity index 98%
rename from Core/src/org/sleuthkit/autopsy/report/ReportingConfigLoader.java
rename to Core/src/org/sleuthkit/autopsy/report/infrastructure/ReportingConfigLoader.java
index ef40bf4eb9..6ab57f8578 100755
--- a/Core/src/org/sleuthkit/autopsy/report/ReportingConfigLoader.java
+++ b/Core/src/org/sleuthkit/autopsy/report/infrastructure/ReportingConfigLoader.java
@@ -16,8 +16,9 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.sleuthkit.autopsy.report;
+package org.sleuthkit.autopsy.report.infrastructure;
 
+import org.sleuthkit.autopsy.report.ReportModuleSettings;
 import java.io.File;
 import java.io.FileInputStream;
 import java.io.FileOutputStream;
diff --git a/Core/src/org/sleuthkit/autopsy/report/TableReportGenerator.java b/Core/src/org/sleuthkit/autopsy/report/infrastructure/TableReportGenerator.java
similarity index 99%
rename from Core/src/org/sleuthkit/autopsy/report/TableReportGenerator.java
rename to Core/src/org/sleuthkit/autopsy/report/infrastructure/TableReportGenerator.java
index 60790c4673..64073a77c1 100644
--- a/Core/src/org/sleuthkit/autopsy/report/TableReportGenerator.java
+++ b/Core/src/org/sleuthkit/autopsy/report/infrastructure/TableReportGenerator.java
@@ -16,8 +16,9 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.sleuthkit.autopsy.report;
+package org.sleuthkit.autopsy.report.infrastructure;
 
+import org.sleuthkit.autopsy.report.modules.ReportHTML;
 import com.google.common.collect.ListMultimap;
 import com.google.common.collect.Lists;
 import com.google.common.collect.Multimaps;
@@ -45,6 +46,7 @@ import org.sleuthkit.autopsy.casemodule.services.TagsManager;
 import org.sleuthkit.autopsy.coreutils.ImageUtils;
 import org.sleuthkit.autopsy.coreutils.Logger;
 import org.sleuthkit.autopsy.datamodel.ContentUtils;
+import org.sleuthkit.autopsy.report.ReportProgressPanel;
 import static org.sleuthkit.autopsy.casemodule.services.TagsManager.getNotableTagLabel;
 import org.sleuthkit.datamodel.AbstractFile;
 import org.sleuthkit.datamodel.Account;
diff --git a/Core/src/org/sleuthkit/autopsy/report/TableReportModule.java b/Core/src/org/sleuthkit/autopsy/report/infrastructure/TableReportModule.java
similarity index 96%
rename from Core/src/org/sleuthkit/autopsy/report/TableReportModule.java
rename to Core/src/org/sleuthkit/autopsy/report/infrastructure/TableReportModule.java
index 3e9a39a46d..1e906a180b 100644
--- a/Core/src/org/sleuthkit/autopsy/report/TableReportModule.java
+++ b/Core/src/org/sleuthkit/autopsy/report/infrastructure/TableReportModule.java
@@ -16,8 +16,9 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.sleuthkit.autopsy.report;
+package org.sleuthkit.autopsy.report.infrastructure;
 
+import org.sleuthkit.autopsy.report.ReportModule;
 import java.util.List;
 
 /**
@@ -29,7 +30,7 @@ import java.util.List;
  * The data sent consists of user-chosen fields such as Blackboard Artifacts and
  * File/Result Tags.
  */
-interface TableReportModule extends ReportModule {
+public interface TableReportModule extends ReportModule {
 
     /**
      * Start the report. Open any output streams, initialize member variables,
diff --git a/Core/src/org/sleuthkit/autopsy/report/TableReportSettings.java b/Core/src/org/sleuthkit/autopsy/report/infrastructure/TableReportSettings.java
similarity index 98%
rename from Core/src/org/sleuthkit/autopsy/report/TableReportSettings.java
rename to Core/src/org/sleuthkit/autopsy/report/infrastructure/TableReportSettings.java
index b33595db68..a5e9168daa 100755
--- a/Core/src/org/sleuthkit/autopsy/report/TableReportSettings.java
+++ b/Core/src/org/sleuthkit/autopsy/report/infrastructure/TableReportSettings.java
@@ -16,7 +16,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.sleuthkit.autopsy.report;
+package org.sleuthkit.autopsy.report.infrastructure;
 
 import java.io.Serializable;
 import java.util.ArrayList;
diff --git a/Core/src/org/sleuthkit/autopsy/report/modules/Bundle.properties b/Core/src/org/sleuthkit/autopsy/report/modules/Bundle.properties
new file mode 100755
index 0000000000..9e8e239a7a
--- /dev/null
+++ b/Core/src/org/sleuthkit/autopsy/report/modules/Bundle.properties
@@ -0,0 +1,76 @@
+OpenIDE-Module-Name=Report
+ReportHTMLConfigurationPanel.headerLabel.text=Header:
+ReportHTMLConfigurationPanel.footerTextField.text=
+ReportHTMLConfigurationPanel.headerTextField.text=
+ReportHTMLConfigurationPanel.footerLabel.text=Footer:
+ReportFileTextConfigurationPanel.tabDelimitedButton.text=Tab delimited
+ReportFileTextConfigurationPanel.commaDelimitedButton.text=Comma delimited
+FileReportText.getName.text=Files - Text
+FileReportText.getDesc.text=A delimited text file containing information about individual files in the case.
+ReportBodyFile.progress.querying=Querying files...
+ReportBodyFile.ingestWarning.text=Warning, this report was run before ingest services completed\!
+ReportBodyFile.progress.loading=Loading files...
+ReportBodyFile.progress.processing=Now processing {0}...
+ReportBodyFile.getName.text=TSK Body File
+ReportBodyFile.getDesc.text=Body file format report with MAC times for every file. This format can be used for a timeline view.
+ReportBodyFile.getFilePath.text=BodyFile.txt
+ReportKML.progress.querying=Querying files...
+ReportKML.progress.loading=Loading files...
+ReportKML.getName.text=Google Earth KML
+ReportKML.getDesc.text=KML format report with coordinates for relevant files. This format can be used for google earth views.
+ReportKML.getFilePath.text=ReportKML.kml
+ReportExcel.numAartifacts.text=Number of artifacts:
+ReportExcel.getName.text=Excel Report
+ReportExcel.getDesc.text=A report about results and tagged items in Excel (XLS) format.
+ReportExcel.sheetName.text=Summary
+ReportExcel.cellVal.summary=Summary
+ReportExcel.cellVal.caseName=Case Name:
+ReportExcel.cellVal.caseNum=Case Number:
+ReportExcel.cellVal.examiner=Examiner:
+ReportExcel.cellVal.numImages=Number of Images:
+ReportHTML.addThumbRows.dataType.title=Tagged Images - {0}
+ReportHTML.addThumbRows.dataType.msg=Tagged Results and Contents that contain images.
+ReportHTML.thumbLink.tags=Tags:
+ReportHTML.getName.text=HTML Report
+ReportHTML.getDesc.text=A report about results and tagged items in HTML format.
+ReportHTML.writeIndex.title=for case {0}
+ReportHTML.writeIndex.noFrames.msg=Your browser is not compatible with our frame setup.
+ReportHTML.writeIndex.noFrames.seeNav=Please see <a href\="content\nav.html">the navigation page</a> for artifact links,
+ReportHTML.writeIndex.seeSum=and <a href\="content\summary.html">the summary page</a> for a case summary.
+ReportHTML.writeNav.title=Report Navigation
+ReportHTML.writeNav.h1=Report Navigation
+ReportHTML.writeNav.summary=Case Summary
+ReportHTML.writeSum.title=Case Summary
+ReportHTML.writeSum.warningMsg=<span>Warning, this report was run before ingest services completed\!</span>
+#
+# autopsy/test/scripts/regression.py._html_report_diff() uses reportGenOn.text, caseName, caseNum, 
+# examiner as a regex signature to skip report.html and summary.html
+#
+ReportHTML.writeSum.reportGenOn.text=HTML Report Generated on {0}
+ReportHTML.writeSum.imageInfoHeading=<h2>Image Information:</h2>
+ReportHTML.writeSum.softwareInfoHeading=<h2>Software Information:</h2>
+ReportHTML.writeSum.ingestHistoryHeading=<h2>Ingest History:</h2>
+ReportHTML.writeSum.modulesEnabledHeading=Enabled Modules:
+ReportHTML.writeSum.autopsyVersion=Autopsy Version:
+ReportHTML.writeSum.timezone=Timezone:
+ReportHTML.writeSum.path=Path:
+ReportBodyFile.generateReport.srcModuleName.text=TSK Body File
+ReportExcel.endReport.srcModuleName.text=Excel Report
+ReportHTML.writeIndex.srcModuleName.text=HTML Report
+ReportKML.genReport.srcModuleName.text=Geospatial Data
+ReportKML.genReport.reportName=KML Report
+ReportKML.latLongStartPoint={0};{1};;{2} (Start)\n
+ReportKML.latLongEndPoint={0};{1};;{2} (End)\n
+FileReportDataTypes.filename.text=Name
+FileReportDataTypes.fileExt.text=File Extension
+FileReportDataTypes.fileType.text=File Type
+FileReportDataTypes.isDel.text=Is Deleted
+FileReportDataTypes.aTime.text=Last Accessed
+FileReportDataTypes.crTime.text=File Created
+FileReportDataTypes.mTime.text=Last Modified
+FileReportDataTypes.size.text=Size
+FileReportDataTypes.address.text=Address
+FileReportDataTypes.hash.text=Hash Value
+FileReportDataTypes.knownStatus.text=Known Status
+FileReportDataTypes.perms.text=Permissions
+FileReportDataTypes.path.text=Full Path
\ No newline at end of file
diff --git a/Core/src/org/sleuthkit/autopsy/report/modules/Bundle.properties-MERGED b/Core/src/org/sleuthkit/autopsy/report/modules/Bundle.properties-MERGED
new file mode 100755
index 0000000000..db4f1b4a4a
--- /dev/null
+++ b/Core/src/org/sleuthkit/autopsy/report/modules/Bundle.properties-MERGED
@@ -0,0 +1,129 @@
+OpenIDE-Module-Name=Report
+PortableCaseReportModule.compressCase.canceled=Compression canceled by user
+PortableCaseReportModule.compressCase.errorCompressingCase=Error compressing case
+# {0} - Temp folder path
+PortableCaseReportModule.compressCase.errorCreatingTempFolder=Could not create temporary folder {0}
+PortableCaseReportModule.compressCase.errorFinding7zip=Could not locate 7-Zip executable
+# {0} - File name
+PortableCaseReportModule.copyContentToPortableCase.copyingFile=Copying file {0}
+# {0} - case folder
+PortableCaseReportModule.createCase.caseDirExists=Case folder {0} already exists
+PortableCaseReportModule.createCase.errorCreatingCase=Error creating case
+# {0} - folder
+PortableCaseReportModule.createCase.errorCreatingFolder=Error creating folder {0}
+PortableCaseReportModule.createCase.errorStoringMaxIds=Error storing maximum database IDs
+PortableCaseReportModule.generateReport.caseClosed=Current case has been closed
+PortableCaseReportModule.generateReport.compressingCase=Compressing case...
+# {0} - tag name
+PortableCaseReportModule.generateReport.copyingArtifacts=Copying artifacts tagged as {0}...
+# {0} - tag name
+PortableCaseReportModule.generateReport.copyingFiles=Copying files tagged as {0}...
+PortableCaseReportModule.generateReport.copyingTags=Copying tags...
+PortableCaseReportModule.generateReport.creatingCase=Creating portable case database...
+PortableCaseReportModule.generateReport.errorCopyingArtifacts=Error copying tagged artifacts
+PortableCaseReportModule.generateReport.errorCopyingFiles=Error copying tagged files
+PortableCaseReportModule.generateReport.errorCopyingInterestingFiles=Error copying interesting files
+PortableCaseReportModule.generateReport.errorCopyingInterestingResults=Error copying interesting results
+PortableCaseReportModule.generateReport.errorCopyingTags=Error copying tags
+# {0} - attribute type name
+PortableCaseReportModule.generateReport.errorLookingUpAttrType=Error looking up attribute type {0}
+PortableCaseReportModule.generateReport.errorReadingSets=Error while reading interesting items sets from case database
+PortableCaseReportModule.generateReport.errorReadingTags=Error while reading tags from case database
+PortableCaseReportModule.generateReport.interestingItemError=Error loading intersting items
+PortableCaseReportModule.generateReport.noContentToCopy=No interesting files, results, or tagged items to copy
+# {0} - output folder
+PortableCaseReportModule.generateReport.outputDirDoesNotExist=Output folder {0} does not exist
+# {0} - output folder
+PortableCaseReportModule.generateReport.outputDirIsNotDir=Output folder {0} is not a folder
+PortableCaseReportModule.generateReport.verifying=Verifying selected parameters...
+PortableCaseReportModule.getDescription.description=Copies selected items to a new single-user case that can be easily shared
+PortableCaseReportModule.getName.name=Portable Case
+ReportExcel.exceptionMessage.dataTooLarge=Value is too long to fit into an Excel cell. 
+ReportExcel.exceptionMessage.errorText=Error showing data into an Excel cell.
+ReportExcel.writeSummary.caseName=Case Name:
+ReportExcel.writeSummary.caseNotes=Case Notes:
+ReportExcel.writeSummary.caseNum=Case Number:
+ReportExcel.writeSummary.examiner=Examiner:
+ReportExcel.writeSummary.numImages=Number of Images:
+ReportExcel.writeSummary.sheetName=Summary
+ReportExcel.writeSummary.summary=Summary
+ReportHTML.writeSum.case=Case:
+ReportHTML.writeSum.caseNotes=Notes:
+ReportHTML.writeSum.caseNumber=Case Number:
+ReportHTML.writeSum.caseNumImages=Number of Images:
+ReportHTML.writeSum.examiner=Examiner:
+ReportHTMLConfigurationPanel.headerLabel.text=Header:
+ReportHTMLConfigurationPanel.footerTextField.text=
+ReportHTMLConfigurationPanel.headerTextField.text=
+ReportHTMLConfigurationPanel.footerLabel.text=Footer:
+ReportFileTextConfigurationPanel.tabDelimitedButton.text=Tab delimited
+ReportFileTextConfigurationPanel.commaDelimitedButton.text=Comma delimited
+FileReportText.getName.text=Files - Text
+FileReportText.getDesc.text=A delimited text file containing information about individual files in the case.
+ReportBodyFile.progress.querying=Querying files...
+ReportBodyFile.ingestWarning.text=Warning, this report was run before ingest services completed\!
+ReportBodyFile.progress.loading=Loading files...
+ReportBodyFile.progress.processing=Now processing {0}...
+ReportBodyFile.getName.text=TSK Body File
+ReportBodyFile.getDesc.text=Body file format report with MAC times for every file. This format can be used for a timeline view.
+ReportBodyFile.getFilePath.text=BodyFile.txt
+ReportKML.progress.querying=Querying files...
+ReportKML.progress.loading=Loading files...
+ReportKML.getName.text=Google Earth KML
+ReportKML.getDesc.text=KML format report with coordinates for relevant files. This format can be used for google earth views.
+ReportKML.getFilePath.text=ReportKML.kml
+ReportExcel.numAartifacts.text=Number of artifacts:
+ReportExcel.getName.text=Excel Report
+ReportExcel.getDesc.text=A report about results and tagged items in Excel (XLS) format.
+ReportExcel.sheetName.text=Summary
+ReportExcel.cellVal.summary=Summary
+ReportExcel.cellVal.caseName=Case Name:
+ReportExcel.cellVal.caseNum=Case Number:
+ReportExcel.cellVal.examiner=Examiner:
+ReportExcel.cellVal.numImages=Number of Images:
+ReportHTML.addThumbRows.dataType.title=Tagged Images - {0}
+ReportHTML.addThumbRows.dataType.msg=Tagged Results and Contents that contain images.
+ReportHTML.thumbLink.tags=Tags:
+ReportHTML.getName.text=HTML Report
+ReportHTML.getDesc.text=A report about results and tagged items in HTML format.
+ReportHTML.writeIndex.title=for case {0}
+ReportHTML.writeIndex.noFrames.msg=Your browser is not compatible with our frame setup.
+ReportHTML.writeIndex.noFrames.seeNav=Please see <a href\="content\nav.html">the navigation page</a> for artifact links,
+ReportHTML.writeIndex.seeSum=and <a href\="content\summary.html">the summary page</a> for a case summary.
+ReportHTML.writeNav.title=Report Navigation
+ReportHTML.writeNav.h1=Report Navigation
+ReportHTML.writeNav.summary=Case Summary
+ReportHTML.writeSum.title=Case Summary
+ReportHTML.writeSum.warningMsg=<span>Warning, this report was run before ingest services completed\!</span>
+#
+# autopsy/test/scripts/regression.py._html_report_diff() uses reportGenOn.text, caseName, caseNum, 
+# examiner as a regex signature to skip report.html and summary.html
+#
+ReportHTML.writeSum.reportGenOn.text=HTML Report Generated on {0}
+ReportHTML.writeSum.imageInfoHeading=<h2>Image Information:</h2>
+ReportHTML.writeSum.softwareInfoHeading=<h2>Software Information:</h2>
+ReportHTML.writeSum.ingestHistoryHeading=<h2>Ingest History:</h2>
+ReportHTML.writeSum.modulesEnabledHeading=Enabled Modules:
+ReportHTML.writeSum.autopsyVersion=Autopsy Version:
+ReportHTML.writeSum.timezone=Timezone:
+ReportHTML.writeSum.path=Path:
+ReportBodyFile.generateReport.srcModuleName.text=TSK Body File
+ReportExcel.endReport.srcModuleName.text=Excel Report
+ReportHTML.writeIndex.srcModuleName.text=HTML Report
+ReportKML.genReport.srcModuleName.text=Geospatial Data
+ReportKML.genReport.reportName=KML Report
+ReportKML.latLongStartPoint={0};{1};;{2} (Start)\n
+ReportKML.latLongEndPoint={0};{1};;{2} (End)\n
+FileReportDataTypes.filename.text=Name
+FileReportDataTypes.fileExt.text=File Extension
+FileReportDataTypes.fileType.text=File Type
+FileReportDataTypes.isDel.text=Is Deleted
+FileReportDataTypes.aTime.text=Last Accessed
+FileReportDataTypes.crTime.text=File Created
+FileReportDataTypes.mTime.text=Last Modified
+FileReportDataTypes.size.text=Size
+FileReportDataTypes.address.text=Address
+FileReportDataTypes.hash.text=Hash Value
+FileReportDataTypes.knownStatus.text=Known Status
+FileReportDataTypes.perms.text=Permissions
+FileReportDataTypes.path.text=Full Path
diff --git a/Core/src/org/sleuthkit/autopsy/report/modules/Bundle_ja.properties b/Core/src/org/sleuthkit/autopsy/report/modules/Bundle_ja.properties
new file mode 100755
index 0000000000..1dc936e5d3
--- /dev/null
+++ b/Core/src/org/sleuthkit/autopsy/report/modules/Bundle_ja.properties
@@ -0,0 +1,64 @@
+FileReportDataTypes.filename.text=\u540d\u524d
+FileReportDataTypes.fileExt.text=\u30d5\u30a1\u30a4\u30eb\u62e1\u5f35\u5b50
+FileReportDataTypes.fileType.text=\u30d5\u30a1\u30a4\u30eb\u30bf\u30a4\u30d7
+FileReportDataTypes.isDel.text=\u306f\u524a\u9664\u3055\u308c\u307e\u3057\u305f
+FileReportDataTypes.aTime.text=\u6700\u5f8c\u306e\u30a2\u30af\u30bb\u30b9
+FileReportDataTypes.crTime.text=\u4f5c\u6210\u3055\u308c\u305f\u30d5\u30a1\u30a4\u30eb
+FileReportDataTypes.mTime.text=\u6700\u5f8c\u306e\u4fee\u6b63
+FileReportDataTypes.size.text=\u30b5\u30a4\u30ba
+FileReportDataTypes.address.text=\u30a2\u30c9\u30ec\u30b9
+FileReportDataTypes.hash.text=\u30cf\u30c3\u30b7\u30e5\u5024
+FileReportDataTypes.knownStatus.text=\u65e2\u77e5\u30b9\u30c6\u30fc\u30bf\u30b9
+FileReportDataTypes.perms.text=\u30d1\u30fc\u30df\u30c3\u30b7\u30e7\u30f3
+FileReportDataTypes.path.text=\u30d5\u30eb\u30d1\u30b9
+FileReportText.getName.text=\u30d5\u30a1\u30a4\u30eb - \u30c6\u30ad\u30b9\u30c8
+FileReportText.getDesc.text=\u30b1\u30fc\u30b9\u306e\u500b\u5225\u30d5\u30a1\u30a4\u30eb\u306b\u3064\u3044\u3066\u306e\u60c5\u5831\u3092\u6301\u3064\u3001\u30bf\u30d6\u533a\u5207\u308a\u30c6\u30ad\u30b9\u30c8\u30d5\u30a1\u30a4\u30eb\u3002
+ReportBodyFile.progress.querying=\u30d5\u30a1\u30a4\u30eb\u306e\u30af\u30a8\u30ea\u3092\u5b9f\u884c\u4e2d\u2026
+ReportBodyFile.ingestWarning.text=\u8b66\u544a\u3001\u30a4\u30f3\u30b8\u30a7\u30b9\u30c8\u30b5\u30fc\u30d3\u30b9\u304c\u5b8c\u4e86\u3059\u308b\u524d\u306b\u30ec\u30dd\u30fc\u30c8\u304c\u5b9f\u884c\u3055\u308c\u307e\u3057\u305f\uff01
+ReportBodyFile.progress.loading=\u30d5\u30a1\u30a4\u30eb\u306e\u8aad\u307f\u8fbc\u307f\u4e2d\u2026
+ReportBodyFile.progress.processing={0}\u3092\u51e6\u7406\u4e2d\u2026
+ReportBodyFile.getName.text=TSK\u30dc\u30c7\u30a3\u30d5\u30a1\u30a4\u30eb
+ReportBodyFile.getDesc.text=\u5404\u30d5\u30a1\u30a4\u30eb\u306eMAC\u30bf\u30a4\u30e0\u3092\u542b\u3080\u3001\u30dc\u30c7\u30a3\u30d5\u30a1\u30a4\u30eb\u5f62\u5f0f\u30ec\u30dd\u30fc\u30c8\u3002\u30bf\u30a4\u30e0\u30e9\u30a4\u30f3\u30d3\u30e5\u30fc\u306b\u3053\u306e\u5f62\u5f0f\u3092\u4f7f\u7528\u3067\u304d\u307e\u3059\u3002
+ReportBodyFile.getFilePath.text=BodyFile.txt
+ReportExcel.numAartifacts.text=\u30a2\u30fc\u30c6\u30a3\u30d5\u30a1\u30af\u30c8\u6570\uff1a
+ReportExcel.getName.text=\u7d50\u679c - Excel
+ReportExcel.getDesc.text=\u7d50\u679c\u306b\u95a2\u3059\u308b\u30ec\u30dd\u30fc\u30c8\u3002Excel(XLS)\u30d5\u30a9\u30fc\u30de\u30c3\u30c8\u3067\u30a2\u30a4\u30c6\u30e0\u306e\u30bf\u30b0\u4ed8\u3051\u304c\u3055\u308c\u3066\u3044\u307e\u3059\u3002
+ReportExcel.sheetName.text=\u30b5\u30de\u30ea\u30fc
+ReportExcel.cellVal.summary=\u30b5\u30de\u30ea\u30fc
+ReportExcel.cellVal.caseName=\u30b1\u30fc\u30b9\u540d\uff1a
+ReportExcel.cellVal.caseNum=\u30b1\u30fc\u30b9\u756a\u53f7\uff1a
+ReportExcel.cellVal.examiner=\u8abf\u67fb\u62c5\u5f53\u8005\uff1a
+ReportExcel.cellVal.numImages=\u30a4\u30e1\u30fc\u30b8\u6570\uff1a
+ReportHTML.addThumbRows.dataType.title=\u30bf\u30b0\u4ed8\u3051\u3055\u308c\u305f\u30a4\u30e1\u30fc\u30b8 - {0}
+ReportHTML.addThumbRows.dataType.msg=\u30a4\u30e1\u30fc\u30b8\u3092\u542b\u3080\u30bf\u30b0\u4ed8\u3051\u3055\u308c\u305f\u7d50\u679c\u304a\u3088\u3073\u30b3\u30f3\u30c6\u30f3\u30c4\u3002
+ReportHTML.thumbLink.tags=\u30bf\u30b0\uff1a
+ReportHTML.getName.text=\u7d50\u679c - HTML
+ReportHTML.getDesc.text=HTML\u5f62\u5f0f\u306e\u7d50\u679c\u304a\u3088\u3073\u30bf\u30b0\u4ed8\u3051\u3055\u308c\u305f\u30a2\u30a4\u30c6\u30e0\u306e\u30ec\u30dd\u30fc\u30c8
+ReportHTML.writeIndex.title=\u30b1\u30fc\u30b9{0}\u306eAutopsy\u30ec\u30dd\u30fc\u30c8
+ReportHTML.writeNav.title=\u30ec\u30dd\u30fc\u30c8\u30ca\u30d3\u30b2\u30fc\u30b7\u30e7\u30f3
+ReportHTML.writeNav.h1=\u30ec\u30dd\u30fc\u30c8\u30ca\u30d3\u30b2\u30fc\u30b7\u30e7\u30f3
+ReportHTML.writeNav.summary=\u30b1\u30fc\u30b9\u30b5\u30de\u30ea\u30fc
+ReportHTML.writeSum.title=\u30b1\u30fc\u30b9\u30b5\u30de\u30ea\u30fc
+ReportHTML.writeSum.caseName=\u30b1\u30fc\u30b9\uff1a
+ReportHTML.writeSum.caseNum=\u30b1\u30fc\u30b9\u756a\u53f7\uff1a
+ReportHTML.writeSum.examiner=\u8abf\u67fb\u62c5\u5f53\u8005\uff1a
+ReportHTML.writeSum.numImages=\u30a4\u30e1\u30fc\u30b8\u6570\uff1a
+ReportHTML.writeSum.path=\u30d1\u30b9\uff1a
+ReportHTML.writeIndex.noFrames.msg=\u4f7f\u7528\u3057\u3066\u3044\u308b\u30d6\u30e9\u30a6\u30b6\u306f\u5f0a\u793e\u306e\u30d5\u30ec\u30fc\u30e0\u30bb\u30c3\u30c8\u30a2\u30c3\u30d7\u3068\u306e\u4e92\u63db\u6027\u304c\u3042\u308a\u307e\u305b\u3093\u3002
+ReportHTML.writeIndex.noFrames.seeNav=\u30a2\u30fc\u30c6\u30a3\u30d5\u30a1\u30af\u30c8\u30ea\u30f3\u30af\u306f\u4e0b\u8a18\u306e\u30ca\u30d3\u30b2\u30fc\u30b7\u30e7\u30f3\u30da\u30fc\u30b8</a>\u3092\u3054\u89a7\u4e0b\u3055\u3044<a href\="nav.html">
+ReportHTML.writeIndex.seeSum=\u307e\u305f\u3001\u30b1\u30fc\u30b9\u30b5\u30de\u30ea\u30fc\u306f\u4e0b\u8a18\u306e\u30b5\u30de\u30ea\u30fc\u30da\u30fc\u30b8</a>\u3092\u3054\u89a7\u4e0b\u3055\u3044\u3002<a href\="summary.html">
+ReportHTML.writeSum.warningMsg=<span>\u8b66\u544a\u3001\u30a4\u30f3\u30b8\u30a7\u30b9\u30c8\u30b5\u30fc\u30d3\u30b9\u304c\u5b8c\u4e86\u3059\u308b\u524d\u306b\u30ec\u30dd\u30fc\u30c8\u304c\u5b9f\u884c\u3055\u308c\u307e\u3057\u305f\uff01</span>
+ReportHTML.writeSum.noExaminer=<i>\u8abf\u67fb\u62c5\u5f53\u8005\u7121\u3057</i>
+ReportHTML.writeSum.imageInfoHeading=<h2>\u30a4\u30e1\u30fc\u30b8\u60c5\u5831\uff1a</h2>
+ReportHTML.writeSum.timezone=\u30bf\u30a4\u30e0\u30be\u30fc\u30f3\uff1a
+ReportHTML.writeSum.reportGenOn.text={0}\u306bHTML\u30ec\u30dd\u30fc\u30c8\u306f\u751f\u6210\u3055\u308c\u307e\u3057\u305f
+ReportHTML.writeSum.noCaseNum=<i>\u30b1\u30fc\u30b9\u756a\u53f7\u304c\u3042\u308a\u307e\u305b\u3093</i>
+ReportKML.getDesc.text=\u95a2\u9023\u30d5\u30a1\u30a4\u30eb\u306e\u5ea7\u6a19\u3092\u542b\u3080KML\u30d5\u30a9\u30fc\u30de\u30c3\u30c8\u306e\u30ec\u30dd\u30fc\u30c8\u3002\u3053\u306e\u30d5\u30a9\u30fc\u30de\u30c3\u30c8\u306fGoogle Earth\u30d3\u30e5\u30fc\u306b\u4f7f\u7528\u3067\u304d\u307e\u3059\u3002
+ReportKML.getName.text=Google Earth/KML
+ReportKML.progress.loading=\u30d5\u30a1\u30a4\u30eb\u306e\u8aad\u307f\u8fbc\u307f\u4e2d\u2026
+ReportKML.progress.querying=\u30d5\u30a1\u30a4\u30eb\u306e\u30af\u30a8\u30ea\u3092\u5b9f\u884c\u4e2d\u2026
+ReportBodyFile.generateReport.srcModuleName.text=TSK\u30dc\u30c7\u30a3\u30d5\u30a1\u30a4\u30eb
+ReportExcel.endReport.srcModuleName.text=Excel\u30ec\u30dd\u30fc\u30c8
+ReportHTML.writeIndex.srcModuleName.text=HTML\u30ec\u30dd\u30fc\u30c8
+ReportKML.genReport.reportName=KML\u30ec\u30dd\u30fc\u30c8
+ReportKML.getFilePath.text=\u30ec\u30dd\u30fc\u30c8KML.kml
\ No newline at end of file
diff --git a/Core/src/org/sleuthkit/autopsy/report/FileReportDataTypes.java b/Core/src/org/sleuthkit/autopsy/report/modules/FileReportDataTypes.java
similarity index 98%
rename from Core/src/org/sleuthkit/autopsy/report/FileReportDataTypes.java
rename to Core/src/org/sleuthkit/autopsy/report/modules/FileReportDataTypes.java
index 621f8d17c9..0aa67c3bdb 100644
--- a/Core/src/org/sleuthkit/autopsy/report/FileReportDataTypes.java
+++ b/Core/src/org/sleuthkit/autopsy/report/modules/FileReportDataTypes.java
@@ -16,7 +16,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.sleuthkit.autopsy.report;
+package org.sleuthkit.autopsy.report.modules;
 
 import org.openide.util.NbBundle;
 import org.sleuthkit.datamodel.AbstractFile;
@@ -30,7 +30,7 @@ import org.sleuthkit.datamodel.TskData;
  *
  * @author jwallace
  */
-enum FileReportDataTypes {
+public enum FileReportDataTypes {
 
     NAME(NbBundle.getMessage(FileReportText.class, "FileReportDataTypes.filename.text")) {
                 @Override
diff --git a/Core/src/org/sleuthkit/autopsy/report/FileReportModuleSettings.java b/Core/src/org/sleuthkit/autopsy/report/modules/FileReportModuleSettings.java
similarity index 93%
rename from Core/src/org/sleuthkit/autopsy/report/FileReportModuleSettings.java
rename to Core/src/org/sleuthkit/autopsy/report/modules/FileReportModuleSettings.java
index 4826b9481e..c09bdb82df 100755
--- a/Core/src/org/sleuthkit/autopsy/report/FileReportModuleSettings.java
+++ b/Core/src/org/sleuthkit/autopsy/report/modules/FileReportModuleSettings.java
@@ -16,7 +16,9 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.sleuthkit.autopsy.report;
+package org.sleuthkit.autopsy.report.modules;
+
+import org.sleuthkit.autopsy.report.ReportModuleSettings;
 
 /**
  * Settings for the File report module.
diff --git a/Core/src/org/sleuthkit/autopsy/report/FileReportText.java b/Core/src/org/sleuthkit/autopsy/report/modules/FileReportText.java
similarity index 96%
rename from Core/src/org/sleuthkit/autopsy/report/FileReportText.java
rename to Core/src/org/sleuthkit/autopsy/report/modules/FileReportText.java
index d938aef263..390562f0b9 100644
--- a/Core/src/org/sleuthkit/autopsy/report/FileReportText.java
+++ b/Core/src/org/sleuthkit/autopsy/report/modules/FileReportText.java
@@ -16,8 +16,10 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.sleuthkit.autopsy.report;
+package org.sleuthkit.autopsy.report.modules;
 
+import org.sleuthkit.autopsy.report.NoReportModuleSettings;
+import org.sleuthkit.autopsy.report.ReportModuleSettings;
 import java.io.BufferedWriter;
 import java.io.FileNotFoundException;
 import java.io.FileOutputStream;
@@ -31,10 +33,10 @@ import java.util.List;
 import java.util.logging.Level;
 import javax.swing.JPanel;
 import org.sleuthkit.autopsy.coreutils.Logger;
-
 import org.openide.util.NbBundle;
 import org.sleuthkit.autopsy.casemodule.Case;
 import org.sleuthkit.autopsy.casemodule.NoCurrentCaseException;
+import org.sleuthkit.autopsy.report.infrastructure.FileReportModule;
 import org.sleuthkit.datamodel.AbstractFile;
 import org.sleuthkit.datamodel.TskCoreException;
 
diff --git a/Core/src/org/sleuthkit/autopsy/report/HTMLReportModuleSettings.java b/Core/src/org/sleuthkit/autopsy/report/modules/HTMLReportModuleSettings.java
similarity index 94%
rename from Core/src/org/sleuthkit/autopsy/report/HTMLReportModuleSettings.java
rename to Core/src/org/sleuthkit/autopsy/report/modules/HTMLReportModuleSettings.java
index 5e2809a882..8da0536b2d 100755
--- a/Core/src/org/sleuthkit/autopsy/report/HTMLReportModuleSettings.java
+++ b/Core/src/org/sleuthkit/autopsy/report/modules/HTMLReportModuleSettings.java
@@ -16,7 +16,9 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.sleuthkit.autopsy.report;
+package org.sleuthkit.autopsy.report.modules;
+
+import org.sleuthkit.autopsy.report.ReportModuleSettings;
 
 /**
  * Settings for the HTML report module.
diff --git a/Core/src/org/sleuthkit/autopsy/report/PortableCaseReportModule.java b/Core/src/org/sleuthkit/autopsy/report/modules/PortableCaseReportModule.java
similarity index 98%
rename from Core/src/org/sleuthkit/autopsy/report/PortableCaseReportModule.java
rename to Core/src/org/sleuthkit/autopsy/report/modules/PortableCaseReportModule.java
index 33c7a16a91..3089f60ef0 100644
--- a/Core/src/org/sleuthkit/autopsy/report/PortableCaseReportModule.java
+++ b/Core/src/org/sleuthkit/autopsy/report/modules/PortableCaseReportModule.java
@@ -16,8 +16,9 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.sleuthkit.autopsy.report;
+package org.sleuthkit.autopsy.report.modules;
 
+import org.sleuthkit.autopsy.report.ReportModule;
 import java.util.logging.Level;
 import java.io.BufferedReader;
 import java.io.File;
@@ -41,6 +42,7 @@ import org.sleuthkit.autopsy.coreutils.Logger;
 import org.sleuthkit.autopsy.coreutils.PlatformUtil;
 import org.sleuthkit.autopsy.datamodel.ContentUtils;
 import org.sleuthkit.autopsy.coreutils.FileTypeUtils.FileTypeCategory;
+import org.sleuthkit.autopsy.report.ReportProgressPanel;
 import org.sleuthkit.autopsy.report.caseuco.CaseUcoFormatExporter;
 import org.sleuthkit.datamodel.AbstractFile;
 import org.sleuthkit.datamodel.BlackboardArtifact;
@@ -64,7 +66,7 @@ import org.sleuthkit.datamodel.VolumeSystem;
 /**
  * Creates a portable case from tagged files
  */
-class PortableCaseReportModule implements ReportModule {
+public class PortableCaseReportModule implements ReportModule {
     private static final Logger logger = Logger.getLogger(PortableCaseReportModule.class.getName());
     private static final String FILE_FOLDER_NAME = "PortableCaseFiles";  // NON-NLS
     private static final String UNKNOWN_FILE_TYPE_FOLDER = "Other";  // NON-NLS
@@ -99,7 +101,7 @@ class PortableCaseReportModule implements ReportModule {
     // Map of old artifact ID to new artifact
     private final Map<Long, BlackboardArtifact> oldArtifactIdToNewArtifact = new HashMap<>();
     
-    PortableCaseReportModule() {
+    public PortableCaseReportModule() {
     }
 
     @NbBundle.Messages({
@@ -190,7 +192,7 @@ class PortableCaseReportModule implements ReportModule {
         "PortableCaseReportModule.generateReport.compressingCase=Compressing case...",
     })
 
-    void generateReport(String reportPath, PortableCaseReportModuleSettings options, ReportProgressPanel progressPanel) {
+    public void generateReport(String reportPath, PortableCaseReportModuleSettings options, ReportProgressPanel progressPanel) {
         this.settings = options;
         progressPanel.setIndeterminate(true);
         progressPanel.start();
@@ -1048,7 +1050,7 @@ class PortableCaseReportModule implements ReportModule {
     /**
      * Processes the result sets from the interesting item set name query.
      */
-    static class GetInterestingItemSetNamesCallback implements CaseDbAccessManager.CaseDbAccessQueryCallback {
+    public static class GetInterestingItemSetNamesCallback implements CaseDbAccessManager.CaseDbAccessQueryCallback {
 
         private static final java.util.logging.Logger logger = java.util.logging.Logger.getLogger(GetInterestingItemSetNamesCallback.class.getName());
         private final Map<String, Long> setCounts = new HashMap<>();
@@ -1077,7 +1079,7 @@ class PortableCaseReportModule implements ReportModule {
          * 
          * @return A map from each set name to the number of items in it
          */
-        Map<String, Long> getSetCountMap() {
+        public Map<String, Long> getSetCountMap() {
             return setCounts;
         }
     }
diff --git a/Core/src/org/sleuthkit/autopsy/report/PortableCaseReportModuleSettings.java b/Core/src/org/sleuthkit/autopsy/report/modules/PortableCaseReportModuleSettings.java
similarity index 84%
rename from Core/src/org/sleuthkit/autopsy/report/PortableCaseReportModuleSettings.java
rename to Core/src/org/sleuthkit/autopsy/report/modules/PortableCaseReportModuleSettings.java
index d52f426536..60dd96b84d 100755
--- a/Core/src/org/sleuthkit/autopsy/report/PortableCaseReportModuleSettings.java
+++ b/Core/src/org/sleuthkit/autopsy/report/modules/PortableCaseReportModuleSettings.java
@@ -16,8 +16,9 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.sleuthkit.autopsy.report;
+package org.sleuthkit.autopsy.report.modules;
 
+import org.sleuthkit.autopsy.report.ReportModuleSettings;
 import java.util.ArrayList;
 import java.util.List;
 import org.sleuthkit.datamodel.TagName;
@@ -25,7 +26,7 @@ import org.sleuthkit.datamodel.TagName;
 /**
  * Settings for the HTML report module.
  */
-class PortableCaseReportModuleSettings implements ReportModuleSettings {
+public class PortableCaseReportModuleSettings implements ReportModuleSettings {
 
     private static final long serialVersionUID = 1L;
 
@@ -40,7 +41,7 @@ class PortableCaseReportModuleSettings implements ReportModuleSettings {
      * Enum for storing the display name for each chunk type and the
      * parameter needed for 7-Zip.
      */
-    enum ChunkSize {
+    public enum ChunkSize {
         
         NONE("Do not split", ""), // NON-NLS
         ONE_HUNDRED_MB("Split into 100 MB chunks", "100m"),
@@ -76,7 +77,7 @@ class PortableCaseReportModuleSettings implements ReportModuleSettings {
         }
     }
 
-    PortableCaseReportModuleSettings() {
+    public PortableCaseReportModuleSettings() {
         this.compress = false;
         this.chunkSize = ChunkSize.NONE;
         this.allTagsSelected = true;
@@ -98,46 +99,46 @@ class PortableCaseReportModuleSettings implements ReportModuleSettings {
         return serialVersionUID;
     }
 
-    void updateSetNames(List<String> setNames) {
+    public void updateSetNames(List<String> setNames) {
         this.setNames.clear();
         this.setNames.addAll(setNames);
     }
 
-    void updateTagNames(List<TagName> tagNames) {
+    public void updateTagNames(List<TagName> tagNames) {
         this.tagNames.clear();
         this.tagNames.addAll(tagNames);
     }
 
-    void updateCompression(boolean compress, ChunkSize chunkSize) {
+    public void updateCompression(boolean compress, ChunkSize chunkSize) {
         this.compress = compress;
         this.chunkSize = chunkSize;
     }
 
-    boolean isValid() {
+    public boolean isValid() {
         return ((allTagsSelected || allSetsSelected || (!tagNames.isEmpty()) || (!setNames.isEmpty())));
     }
 
-    List<String> getSelectedSetNames() {
+    public List<String> getSelectedSetNames() {
         return new ArrayList<>(setNames);
     }
 
-    List<TagName> getSelectedTagNames() {
+    public List<TagName> getSelectedTagNames() {
         return new ArrayList<>(tagNames);
     }
 
-    boolean shouldCompress() {
+    public boolean shouldCompress() {
         return compress;
     }
 
-    ChunkSize getChunkSize() {
+    public ChunkSize getChunkSize() {
         return chunkSize;
     }
 
-    boolean isAllTagsSelected() {
+    public boolean isAllTagsSelected() {
         return allTagsSelected;
     }
 
-    boolean isAllSetsSelected() {
+    public boolean isAllSetsSelected() {
         return allSetsSelected;
     }
 
diff --git a/Core/src/org/sleuthkit/autopsy/report/ReportBodyFile.java b/Core/src/org/sleuthkit/autopsy/report/modules/ReportBodyFile.java
similarity index 98%
rename from Core/src/org/sleuthkit/autopsy/report/ReportBodyFile.java
rename to Core/src/org/sleuthkit/autopsy/report/modules/ReportBodyFile.java
index 4695418117..895031b312 100644
--- a/Core/src/org/sleuthkit/autopsy/report/ReportBodyFile.java
+++ b/Core/src/org/sleuthkit/autopsy/report/modules/ReportBodyFile.java
@@ -20,8 +20,9 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.sleuthkit.autopsy.report;
+package org.sleuthkit.autopsy.report.modules;
 
+import org.sleuthkit.autopsy.report.GeneralReportModule;
 import java.io.BufferedWriter;
 import java.io.FileWriter;
 import java.io.IOException;
@@ -34,6 +35,7 @@ import org.sleuthkit.autopsy.casemodule.Case;
 import org.sleuthkit.autopsy.casemodule.NoCurrentCaseException;
 import org.sleuthkit.autopsy.coreutils.Logger;
 import org.sleuthkit.autopsy.ingest.IngestManager;
+import org.sleuthkit.autopsy.report.ReportProgressPanel;
 import org.sleuthkit.autopsy.report.ReportProgressPanel.ReportStatus;
 import org.sleuthkit.datamodel.*;
 
diff --git a/Core/src/org/sleuthkit/autopsy/report/ReportExcel.java b/Core/src/org/sleuthkit/autopsy/report/modules/ReportExcel.java
similarity index 99%
rename from Core/src/org/sleuthkit/autopsy/report/ReportExcel.java
rename to Core/src/org/sleuthkit/autopsy/report/modules/ReportExcel.java
index bba8477bad..51ba30736b 100644
--- a/Core/src/org/sleuthkit/autopsy/report/ReportExcel.java
+++ b/Core/src/org/sleuthkit/autopsy/report/modules/ReportExcel.java
@@ -16,7 +16,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.sleuthkit.autopsy.report;
+package org.sleuthkit.autopsy.report.modules;
 
 import java.io.FileOutputStream;
 import java.io.IOException;
@@ -30,6 +30,7 @@ import org.openide.util.NbBundle.Messages;
 import org.sleuthkit.autopsy.casemodule.Case;
 import org.sleuthkit.autopsy.casemodule.NoCurrentCaseException;
 import org.sleuthkit.autopsy.coreutils.Logger;
+import org.sleuthkit.autopsy.report.infrastructure.TableReportModule;
 import org.sleuthkit.datamodel.TskCoreException;
 
 class ReportExcel implements TableReportModule {
diff --git a/Core/src/org/sleuthkit/autopsy/report/ReportFileTextConfigurationPanel.form b/Core/src/org/sleuthkit/autopsy/report/modules/ReportFileTextConfigurationPanel.form
similarity index 87%
rename from Core/src/org/sleuthkit/autopsy/report/ReportFileTextConfigurationPanel.form
rename to Core/src/org/sleuthkit/autopsy/report/modules/ReportFileTextConfigurationPanel.form
index d0c59f7bdd..491bff6dc5 100644
--- a/Core/src/org/sleuthkit/autopsy/report/ReportFileTextConfigurationPanel.form
+++ b/Core/src/org/sleuthkit/autopsy/report/modules/ReportFileTextConfigurationPanel.form
@@ -50,7 +50,7 @@
         </Property>
         <Property name="selected" type="boolean" value="true"/>
         <Property name="text" type="java.lang.String" editor="org.netbeans.modules.i18n.form.FormI18nStringEditor">
-          <ResourceString bundle="org/sleuthkit/autopsy/report/Bundle.properties" key="ReportFileTextConfigurationPanel.tabDelimitedButton.text" replaceFormat="org.openide.util.NbBundle.getMessage({sourceFileName}.class, &quot;{key}&quot;)"/>
+          <ResourceString bundle="org/sleuthkit/autopsy/report/modules/Bundle.properties" key="ReportFileTextConfigurationPanel.tabDelimitedButton.text" replaceFormat="org.openide.util.NbBundle.getMessage({sourceFileName}.class, &quot;{key}&quot;)"/>
         </Property>
       </Properties>
     </Component>
@@ -60,7 +60,7 @@
           <ComponentRef name="delimiterGroup"/>
         </Property>
         <Property name="text" type="java.lang.String" editor="org.netbeans.modules.i18n.form.FormI18nStringEditor">
-          <ResourceString bundle="org/sleuthkit/autopsy/report/Bundle.properties" key="ReportFileTextConfigurationPanel.commaDelimitedButton.text" replaceFormat="org.openide.util.NbBundle.getMessage({sourceFileName}.class, &quot;{key}&quot;)"/>
+          <ResourceString bundle="org/sleuthkit/autopsy/report/modules/Bundle.properties" key="ReportFileTextConfigurationPanel.commaDelimitedButton.text" replaceFormat="org.openide.util.NbBundle.getMessage({sourceFileName}.class, &quot;{key}&quot;)"/>
         </Property>
       </Properties>
     </Component>
diff --git a/Core/src/org/sleuthkit/autopsy/report/ReportFileTextConfigurationPanel.java b/Core/src/org/sleuthkit/autopsy/report/modules/ReportFileTextConfigurationPanel.java
similarity index 99%
rename from Core/src/org/sleuthkit/autopsy/report/ReportFileTextConfigurationPanel.java
rename to Core/src/org/sleuthkit/autopsy/report/modules/ReportFileTextConfigurationPanel.java
index 2fbb6e97fc..65efe092ff 100644
--- a/Core/src/org/sleuthkit/autopsy/report/ReportFileTextConfigurationPanel.java
+++ b/Core/src/org/sleuthkit/autopsy/report/modules/ReportFileTextConfigurationPanel.java
@@ -16,7 +16,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.sleuthkit.autopsy.report;
+package org.sleuthkit.autopsy.report.modules;
 
 /**
  * Panel for configuring settings for the file text report
diff --git a/Core/src/org/sleuthkit/autopsy/report/ReportHTML.java b/Core/src/org/sleuthkit/autopsy/report/modules/ReportHTML.java
similarity index 99%
rename from Core/src/org/sleuthkit/autopsy/report/ReportHTML.java
rename to Core/src/org/sleuthkit/autopsy/report/modules/ReportHTML.java
index 3f2175bc42..9e18e8e2c7 100644
--- a/Core/src/org/sleuthkit/autopsy/report/ReportHTML.java
+++ b/Core/src/org/sleuthkit/autopsy/report/modules/ReportHTML.java
@@ -20,8 +20,10 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.sleuthkit.autopsy.report;
+package org.sleuthkit.autopsy.report.modules;
 
+import org.sleuthkit.autopsy.report.NoReportModuleSettings;
+import org.sleuthkit.autopsy.report.ReportModuleSettings;
 import java.awt.image.BufferedImage;
 import java.io.BufferedWriter;
 import java.io.File;
@@ -67,6 +69,8 @@ import org.sleuthkit.autopsy.coreutils.Logger;
 import org.sleuthkit.autopsy.coreutils.Version;
 import org.sleuthkit.autopsy.datamodel.ContentUtils.ExtractFscContentVisitor;
 import org.sleuthkit.autopsy.ingest.IngestManager;
+import org.sleuthkit.autopsy.report.ReportBranding;
+import org.sleuthkit.autopsy.report.infrastructure.TableReportModule;
 import org.sleuthkit.datamodel.AbstractFile;
 import org.sleuthkit.datamodel.BlackboardArtifact;
 import org.sleuthkit.datamodel.BlackboardArtifact.ARTIFACT_TYPE;
@@ -80,7 +84,7 @@ import org.sleuthkit.datamodel.TskCoreException;
 import org.sleuthkit.datamodel.TskData;
 import org.sleuthkit.datamodel.TskData.TSK_DB_FILES_TYPE_ENUM;
 
-class ReportHTML implements TableReportModule {
+public class ReportHTML implements TableReportModule {
 
     private static final Logger logger = Logger.getLogger(ReportHTML.class.getName());
     private static final String THUMBS_REL_PATH = "thumbs" + File.separator; //NON-NLS
@@ -88,7 +92,7 @@ class ReportHTML implements TableReportModule {
     private static final int MAX_THUMBS_PER_PAGE = 1000;
     private static final String HTML_SUBDIR = "content";
     private Case currentCase;
-    static Integer THUMBNAIL_COLUMNS = 5;
+    public static Integer THUMBNAIL_COLUMNS = 5;
 
     private Map<String, Integer> dataTypes;
     private String path;
diff --git a/Core/src/org/sleuthkit/autopsy/report/ReportHTMLConfigurationPanel.form b/Core/src/org/sleuthkit/autopsy/report/modules/ReportHTMLConfigurationPanel.form
similarity index 81%
rename from Core/src/org/sleuthkit/autopsy/report/ReportHTMLConfigurationPanel.form
rename to Core/src/org/sleuthkit/autopsy/report/modules/ReportHTMLConfigurationPanel.form
index 33a7eb0b43..518a86f75f 100755
--- a/Core/src/org/sleuthkit/autopsy/report/ReportHTMLConfigurationPanel.form
+++ b/Core/src/org/sleuthkit/autopsy/report/modules/ReportHTMLConfigurationPanel.form
@@ -60,28 +60,28 @@
     <Component class="javax.swing.JLabel" name="headerLabel">
       <Properties>
         <Property name="text" type="java.lang.String" editor="org.netbeans.modules.i18n.form.FormI18nStringEditor">
-          <ResourceString bundle="org/sleuthkit/autopsy/report/Bundle.properties" key="ReportHTMLConfigurationPanel.headerLabel.text" replaceFormat="org.openide.util.NbBundle.getMessage({sourceFileName}.class, &quot;{key}&quot;)"/>
+          <ResourceString bundle="org/sleuthkit/autopsy/report/modules/Bundle.properties" key="ReportHTMLConfigurationPanel.headerLabel.text" replaceFormat="org.openide.util.NbBundle.getMessage({sourceFileName}.class, &quot;{key}&quot;)"/>
         </Property>
       </Properties>
     </Component>
     <Component class="javax.swing.JLabel" name="footerLabel">
       <Properties>
         <Property name="text" type="java.lang.String" editor="org.netbeans.modules.i18n.form.FormI18nStringEditor">
-          <ResourceString bundle="org/sleuthkit/autopsy/report/Bundle.properties" key="ReportHTMLConfigurationPanel.footerLabel.text" replaceFormat="org.openide.util.NbBundle.getMessage({sourceFileName}.class, &quot;{key}&quot;)"/>
+          <ResourceString bundle="org/sleuthkit/autopsy/report/modules/Bundle.properties" key="ReportHTMLConfigurationPanel.footerLabel.text" replaceFormat="org.openide.util.NbBundle.getMessage({sourceFileName}.class, &quot;{key}&quot;)"/>
         </Property>
       </Properties>
     </Component>
     <Component class="javax.swing.JTextField" name="headerTextField">
       <Properties>
         <Property name="text" type="java.lang.String" editor="org.netbeans.modules.i18n.form.FormI18nStringEditor">
-          <ResourceString bundle="org/sleuthkit/autopsy/report/Bundle.properties" key="ReportHTMLConfigurationPanel.headerTextField.text" replaceFormat="org.openide.util.NbBundle.getMessage({sourceFileName}.class, &quot;{key}&quot;)"/>
+          <ResourceString bundle="org/sleuthkit/autopsy/report/modules/Bundle.properties" key="ReportHTMLConfigurationPanel.headerTextField.text" replaceFormat="org.openide.util.NbBundle.getMessage({sourceFileName}.class, &quot;{key}&quot;)"/>
         </Property>
       </Properties>
     </Component>
     <Component class="javax.swing.JTextField" name="footerTextField">
       <Properties>
         <Property name="text" type="java.lang.String" editor="org.netbeans.modules.i18n.form.FormI18nStringEditor">
-          <ResourceString bundle="org/sleuthkit/autopsy/report/Bundle.properties" key="ReportHTMLConfigurationPanel.footerTextField.text" replaceFormat="org.openide.util.NbBundle.getMessage({sourceFileName}.class, &quot;{key}&quot;)"/>
+          <ResourceString bundle="org/sleuthkit/autopsy/report/modules/Bundle.properties" key="ReportHTMLConfigurationPanel.footerTextField.text" replaceFormat="org.openide.util.NbBundle.getMessage({sourceFileName}.class, &quot;{key}&quot;)"/>
         </Property>
       </Properties>
     </Component>
diff --git a/Core/src/org/sleuthkit/autopsy/report/ReportHTMLConfigurationPanel.java b/Core/src/org/sleuthkit/autopsy/report/modules/ReportHTMLConfigurationPanel.java
similarity index 99%
rename from Core/src/org/sleuthkit/autopsy/report/ReportHTMLConfigurationPanel.java
rename to Core/src/org/sleuthkit/autopsy/report/modules/ReportHTMLConfigurationPanel.java
index ab1d97fa43..9a0226969e 100755
--- a/Core/src/org/sleuthkit/autopsy/report/ReportHTMLConfigurationPanel.java
+++ b/Core/src/org/sleuthkit/autopsy/report/modules/ReportHTMLConfigurationPanel.java
@@ -16,7 +16,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.sleuthkit.autopsy.report;
+package org.sleuthkit.autopsy.report.modules;
 
 /**
  * The panel shown for all TableReportModules when configuring report modules.
diff --git a/Core/src/org/sleuthkit/autopsy/report/ReportKML.java b/Core/src/org/sleuthkit/autopsy/report/modules/ReportKML.java
similarity index 99%
rename from Core/src/org/sleuthkit/autopsy/report/ReportKML.java
rename to Core/src/org/sleuthkit/autopsy/report/modules/ReportKML.java
index 55f5809a7e..b7d4f4cdd3 100644
--- a/Core/src/org/sleuthkit/autopsy/report/ReportKML.java
+++ b/Core/src/org/sleuthkit/autopsy/report/modules/ReportKML.java
@@ -17,8 +17,9 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.sleuthkit.autopsy.report;
+package org.sleuthkit.autopsy.report.modules;
 
+import org.sleuthkit.autopsy.report.GeneralReportModule;
 import javax.swing.JPanel;
 
 import org.openide.util.NbBundle;
@@ -44,6 +45,8 @@ import org.jdom2.output.XMLOutputter;
 import org.jdom2.CDATA;
 import org.openide.filesystems.FileUtil;
 import org.sleuthkit.autopsy.casemodule.NoCurrentCaseException;
+import org.sleuthkit.autopsy.report.ReportBranding;
+import org.sleuthkit.autopsy.report.ReportProgressPanel;
 import org.sleuthkit.datamodel.ReadContentInputStream.ReadContentInputStreamException;
 
 /**
@@ -184,7 +187,7 @@ class ReportKML implements GeneralReportModule {
         document.addContent(gpsSearchesFolder);
         document.addContent(gpsTrackpointsFolder);
 
-        ReportProgressDialog.ReportStatus result = ReportProgressPanel.ReportStatus.COMPLETE;
+        ReportProgressPanel.ReportStatus result = ReportProgressPanel.ReportStatus.COMPLETE;
 
         /**
          * In the following code, nulls are okay, and are handled when we go to