diff --git a/Core/src/org/sleuthkit/autopsy/casemodule/Bundle.properties.old b/Core/src/org/sleuthkit/autopsy/casemodule/Bundle.properties
similarity index 100%
rename from Core/src/org/sleuthkit/autopsy/casemodule/Bundle.properties.old
rename to Core/src/org/sleuthkit/autopsy/casemodule/Bundle.properties
diff --git a/Core/src/org/sleuthkit/autopsy/core/Bundle.properties b/Core/src/org/sleuthkit/autopsy/core/Bundle.properties
index ecbba6baf8..0f22cca953 100644
--- a/Core/src/org/sleuthkit/autopsy/core/Bundle.properties
+++ b/Core/src/org/sleuthkit/autopsy/core/Bundle.properties
@@ -1,130 +1 @@
OpenIDE-Module-Name=Core
-
-CTL_AddImage=Add Image...
-CTL_AddImageButton=Add Image
-CTL_CaseAction=Case
-CTL_CaseCloseAct=Close Case
-CTL_CaseNewAction=New Case...
-#CTL_CaseOpenActionOld=Open Case(old)...
-CTL_CasePropertiesAction=Case Properties...
-CTL_CaseTopComponent=Case Window
-#CTL_NewCaseAct=New Case(Old)...
-CTL_OpenAction=Open Case...
-CTL_RecentCases=Recent Cases
-CTL_CaseDeleteAction=Delete Case
-CTL_SaveCaseAction=Save Case
-CTL_testAction=test
-CTL_testTopComponent=test Window
-HINT_CaseTopComponent=This is a Case window
-HINT_testTopComponent=This is a test window
-Menu/File/org-sleuthkit-autopsy-casemodule-CaseCloseAct.shadow=
-Menu/File/org-sleuthkit-autopsy-casemodule-OpenAction.shadow=Open Case
-CaseVisualPanel1.jLabel1.text=Name
-CaseVisualPanel1.jLabel2.text=Image Path:
-CaseVisualPanel1.jLabel3.text=Database Path:
-CaseTopComponent.jLabel1.text=Name
-CaseVisualPanel1.NameField.text=
-CaseVisualPanel1.ImgPath.text=
-CaseVisualPanel1.DbPath.text=
-CaseTopComponent.jLabel2.text=Image Path
-CaseTopComponent.jLabel3.text=DB Path
-CaseVisualPanel1.ImgPathBrowserButton.text=Browse
-CaseVisualPanel1.DbPathBrowserButton.text=Browse
-NewCaseVisualPanel1.jLabel1.text=Name
-NewCaseVisualPanel1.jTextField1.text=
-NewCaseVisualPanel1.jLabel2.text=Image Type:
-NewCaseVisualPanel1.jRadioButton1.text=Raw Single .img .dd
-NewCaseVisualPanel1.jRadioButton2.text=Raw Split .001 .002 etc
-NewCaseVisualPanel1.jRadioButton3.text=Encase .e01
-NewCaseVisualPanel1.nameLabel.text_1=Name
-NewCaseVisualPanel1.NameField.text_1=
-NewCaseVisualPanel1.TypeLabel.text_1=Image Type:
-NewCaseVisualPanel1.rawSingleRadio.text_1=Raw Single .img .dd
-NewCaseVisualPanel1.rawSplitRadio.text_1=Raw Split .001 .002 etc
-NewCaseVisualPanel1.encaseRadio.text_1=EnCase .e01
-NewCaseVisualPanel2.jLabel1.text=Image Path:
-NewCaseVisualPanel2.jLabel2.text=DataBase Path:
-NewCaseVisualPanel2.descriptionText.text=variable text
-NewCaseVisualPanel2.ImgBrowserButton.text=Browse
-NewCaseVisualPanel2.DcBrowserButton.text=Browse
-NewCaseVisualPanel2.ImagePathField.text=
-NewCaseVisualPanel2.DbPathField.text=
-CaseVisualPanel1.jLabel4.text=Image Type:
-CaseVisualPanel1.rawSingle.text=Raw Single .img .dd
-CaseVisualPanel1.rawSplit.text=Raw Split .001 .002 etc
-CaseVisualPanel1.encase.text=EnCase .e01 .e02 etc
-CaseVisualPanel1.multipleSelectLabel.text=Single Image: Multiple Select Disabled
-CaseVisualPanel1.jLabel5.text=If a database has not already been loaded / created for the chosen image use this button: (could take a few minutes)
-CaseVisualPanel1.ProgressLabel.text=
-CaseVisualPanel1.createDbButton.text=Create Database
-NewCaseVisualPanel1.jLabel1.text_1=Enter New Case Information:
-NewCaseVisualPanel1.caseNameLabel.text_1=Case Name:
-NewCaseVisualPanel1.caseDirLabel.text=Base Directory:
-NewCaseVisualPanel1.caseDirBrowseButton.text=Browse
-NewCaseVisualPanel1.caseNameTextField.text_1=
-NewCaseVisualPanel1.jLabel2.text_1=Case data will be stored in the following directory:
-NewCaseVisualPanel1.caseParentDirTextField.text=
-NewCaseVisualPanel1.caseDirTextField.text_1=
-CasePropertiesForm.caseDirLabel.text=Case Directory:
-CasePropertiesForm.crDateLabel.text=Created Date:
-CasePropertiesForm.caseNameLabel.text=Case Name:
-CasePropertiesForm.crDateTextField.text=
-CasePropertiesForm.caseNameTextField.text=
-CasePropertiesForm.updateCaseNameButton.text=Update
-CasePropertiesForm.casePropLabel.text=Case Information
-CasePropertiesForm.genInfoLabel.text=General Information
-CasePropertiesForm.imgInfoLabel.text=Images Information
-CasePropertiesForm.OKButton.text=OK
-CasePropertiesForm.deleteCaseButton.text=Delete Case
-CueBannerPanel.autopsyLogo.text=
-CueBannerPanel.createNewLabel.text=Create New Case
-CueBannerPanel.autopsyLabel.text=Autopsy
-CueBannerPanel.welcomeLabel.text=Welcome to
-CueBannerPanel.openLabel.text=Open Existing Case
-CueBannerPanel.closeButton.text=Close
-CueBannerPanel.openRecentLabel.text=Open Recent Case
-CueBannerPanel.newCaseButton.text=
-CueBannerPanel.openCaseButton.text=
-CueBannerPanel.openRecentButton.text=
-OpenRecentCasePanel.cancelButton.text=Cancel
-OpenRecentCasePanel.jLabel1.text=Recent Cases
-AddImageVisualPanel1.imgInfoLabel.text=Enter Disk Image Information:
-AddImageVisualPanel2.crDbLabel.text=Adding Image
-AddImageVisualPanel2.jLabel5.text=Processing Image and Adding to Database :
-AddImageVisualPanel2.jLabel1.text= We are now analyzing the disk image to extract volume and file system data and populate a local database.
-AddImageVisualPanel1.timeZoneLabel.text=Please select the image timezone:
-AddImageVisualPanel1.imgPathTextField.text=
-AddImageVisualPanel1.imgPathLabel.text=Image Path:
-AddImageVisualPanel1.imgPathBrowserButton.text=Browse
-NewJPanel.jLabel1.text=
-NewJPanel.jLabel2.text=NSRL Index
-NewJPanel.jLabel5.text=The NSRL index is used to idenify "known" files.
-NewJPanel.jFormattedTextField1.text=jFormattedTextField1
-NewJPanel.jButton1.text=Rename
-NewJPanel.jLabel4.text=Database:
-AddImageVisualPanel2.indexImageCheckBox.text=Index image for keyword search
-AddImageVisualPanel1.jLabel2.text= Press 'Next' to analyze the disk image to extract volume and file system data and populate a local database.
-AddImageVisualPanel4.jLabel1.text=Image was successfully added to the case and is being processed.
-AddImageVisualPanel4.crDbLabel.text=Image Added and Being Processed
-AddImageVisualPanel4.addImgButton.text=Add Another Image
-AddImageVisualPanel3.titleLabel.text=Configure Ingest Modules
-AddImageVisualPanel3.subtitleLabel.text=Image has been commited. You can configure and run ingest modules on the new image.
-CasePropertiesForm.caseNumberLabel.text=Case Number:
-CasePropertiesForm.examinerLabel.text=Examiner:
-CasePropertiesForm.caseNumberTextField.text=
-CasePropertiesForm.examinerTextField.text=
-NewCaseVisualPanel2.caseNumberTextField.text=
-NewCaseVisualPanel2.examinerLabel.text=Examiner:
-NewCaseVisualPanel2.caseNumberLabel.text=Case Number:
-NewCaseVisualPanel2.examinerTextField.text=
-NewCaseVisualPanel2.optionalLabel.text=Optional: Set Case Number and Examiner
-AddImageVisualPanel1.noFatOrphansCheckbox.toolTipText=
-AddImageVisualPanel1.noFatOrphansCheckbox.text=Ignore orphan files in FAT file systems
-AddImageVisualPanel1.optionsLabel1.text=Options to produce results faster (although some data will not be searched):
-AddImageErrorsDialog.title=Add Image Log
-AddImageErrorsDialog.copyButton.toolTipText=Copy errors to clipboard
-AddImageErrorsDialog.copyButton.text=Copy
-AddImageErrorsDialog.closeButton.toolTipText=Close this window
-AddImageErrorsDialog.closeButton.text=Close
-AddImageVisualPanel4.jLabel2.text=You can add another image or click Finish to return to the case and view results.
-
diff --git a/Core/src/org/sleuthkit/autopsy/core/layer - case.xml b/Core/src/org/sleuthkit/autopsy/core/layer - case.xml
new file mode 100644
index 0000000000..e3af281221
--- /dev/null
+++ b/Core/src/org/sleuthkit/autopsy/core/layer - case.xml
@@ -0,0 +1,166 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/Core/src/org/sleuthkit/autopsy/core/layer-empty.xml b/Core/src/org/sleuthkit/autopsy/core/layer-empty.xml
new file mode 100644
index 0000000000..f8c0c0ff39
--- /dev/null
+++ b/Core/src/org/sleuthkit/autopsy/core/layer-empty.xml
@@ -0,0 +1,5 @@
+
+
+
+
+