diff --git a/Core/src/org/sleuthkit/autopsy/timeline/Bundle.properties b/Core/src/org/sleuthkit/autopsy/timeline/Bundle.properties
deleted file mode 100644
index b320647823fdf858ad9b13268643d9535525c1f7..0000000000000000000000000000000000000000
--- a/Core/src/org/sleuthkit/autopsy/timeline/Bundle.properties
+++ /dev/null
@@ -1,33 +0,0 @@
-OpenIDE-Module-Display-Category=External Viewers
-OpenIDE-Module-Long-Description=\
-    Displays user activity as an interactive timeline chart with year, month and day granularity. \n\
-    Events for a selected day are viewable in the built-in result and content viewers.
-OpenIDE-Module-Name=Timeline
-CTL_MakeTimeline="Make Timeline (Beta)"
-CTL_TimelineView=Generate Timeline
-OpenIDE-Module-Short-Description=Displays user activity timeline
-TimelineProgressDialog.jLabel1.text=Creating timeline . . .
-TimelineFrame.title=Timeline
-Timeline.frameName.text={0} - Autopsy Timeline (Beta)
-Timeline.resultsPanel.title=Timeline Results
-Timeline.getName=Make Timeline (Beta)
-Timeline.runJavaFxThread.progress.creating=Creating timeline . . .
-Timeline.runJavaFxThread.progress.genBodyFile=Generating Bodyfile
-Timeline.runJavaFxThread.progress.genMacTime=Generating Mactime
-Timeline.runJavaFxThread.progress.parseMacTime=Parsing Mactime
-Timeline.zoomOutButton.text=Zoom Out
-Timeline.goToButton.text=Go To\:
-Timeline.yearBarChart.x.years=Years
-Timeline.yearBarChart.y.numEvents=Number of Events
-Timeline.MonthsBarChart.x.monthYY=Month ({0})
-Timeline.MonthsBarChart.y.numEvents=Number of Events
-Timeline.eventsByMoBarChart.x.dayOfMo=Day of Month
-Timeline.eventsByMoBarChart.y.numEvents=Number of Events
-Timeline.node.emptyRoot=Empty Root
-Timeline.resultPanel.loading=Loading...
-Timeline.node.root=Root
-Timeline.propChg.confDlg.timelineOOD.msg=Timeline is out of date. Would you like to regenerate it?
-Timeline.propChg.confDlg.timelineOOD.details=Select an option
-Timeline.initTimeline.confDlg.genBeforeIngest.msg=You are trying to generate a timeline before ingest has been completed. The timeline may be incomplete. Do you want to continue?
-Timeline.initTimeline.confDlg.genBeforeIngest.deails=Timeline
-TimelineProgressDialog.setName.text=Make Timeline (Beta)
diff --git a/Core/src/org/sleuthkit/autopsy/timeline/Bundle_ja.properties b/Core/src/org/sleuthkit/autopsy/timeline/Bundle_ja.properties
deleted file mode 100644
index b905bd12053d786f21c70d3ed2c1a08983688293..0000000000000000000000000000000000000000
--- a/Core/src/org/sleuthkit/autopsy/timeline/Bundle_ja.properties
+++ /dev/null
@@ -1,33 +0,0 @@
-OpenIDE-Module-Display-Category=\u5916\u90E8\u30D3\u30E5\u30FC\u30A2
-OpenIDE-Module-Long-Description=\
-    \u30E6\u30FC\u30B6\u30A2\u30AF\u30C6\u30A3\u30D3\u30C6\u30A3\u3092\u5E74\u3001\u6708\u3001\u65E5\u306E\u5358\u4F4D\u3067\u3001\u30A4\u30F3\u30BF\u30E9\u30AF\u30C6\u30A3\u30D6\u306A\u30BF\u30A4\u30E0\u30E9\u30A4\u30F3\u30C1\u30E3\u30FC\u30C8\u3068\u3057\u3066\u8868\u793A\u3057\u307E\u3059\u3002\n\
-    \u9078\u629E\u3057\u305F\u65E5\u306E\u30A4\u30D9\u30F3\u30C8\u306F\u5185\u8535\u306E\u7D50\u679C\u304A\u3088\u3073\u30B3\u30F3\u30C6\u30F3\u30C4\u30D3\u30E5\u30FC\u30A2\u3067\u78BA\u8A8D\u3067\u304D\u307E\u3059\u3002
-OpenIDE-Module-Name=\u30BF\u30A4\u30E0\u30E9\u30A4\u30F3
-CTL_MakeTimeline="\u30BF\u30A4\u30E0\u30E9\u30A4\u30F3\u4F5C\u6210\uFF08\u30D9\u30FC\u30BF\uFF09"
-CTL_TimelineView=\u30BF\u30A4\u30E0\u30E9\u30A4\u30F3\u4F5C\u6210
-OpenIDE-Module-Short-Description=\u30E6\u30FC\u30B6\u30A2\u30AF\u30C6\u30A3\u30D3\u30C6\u30A3\u30BF\u30A4\u30E0\u30E9\u30A4\u30F3\u3092\u8868\u793A
-TimelineProgressDialog.jLabel1.text=\u30BF\u30A4\u30E0\u30E9\u30A4\u30F3\u3092\u4F5C\u6210\u4E2D\u2026
-TimelineFrame.title=\u30BF\u30A4\u30E0\u30E9\u30A4\u30F3
-Timeline.frameName.text={0} - Autopsy\u30BF\u30A4\u30E0\u30E9\u30A4\u30F3\uFF08\u30D9\u30FC\u30BF\uFF09
-Timeline.resultsPanel.title=\u30BF\u30A4\u30E0\u30E9\u30A4\u30F3\u7D50\u679C
-Timeline.getName=\u30BF\u30A4\u30E0\u30E9\u30A4\u30F3\u4F5C\u6210\uFF08\u30D9\u30FC\u30BF\uFF09
-Timeline.runJavaFxThread.progress.creating=\u30BF\u30A4\u30E0\u30E9\u30A4\u30F3\u3092\u4F5C\u6210\u4E2D\u2026
-Timeline.runJavaFxThread.progress.genBodyFile=Bodyfile\u3092\u4F5C\u6210\u4E2D
-Timeline.runJavaFxThread.progress.genMacTime=MAC\u30BF\u30A4\u30E0\u3092\u4F5C\u6210\u4E2D
-Timeline.runJavaFxThread.progress.parseMacTime=MAC\u30BF\u30A4\u30E0\u3092\u30D1\u30FC\u30B9\u4E2D
-Timeline.zoomOutButton.text=\u7E2E\u5C0F
-Timeline.goToButton.text=\u4E0B\u8A18\u3078\u79FB\u52D5\uFF1A
-Timeline.yearBarChart.x.years=\u5E74
-Timeline.yearBarChart.y.numEvents=\u30A4\u30D9\u30F3\u30C8\u6570
-Timeline.MonthsBarChart.x.monthYY=\u6708 ({0})
-Timeline.MonthsBarChart.y.numEvents=\u30A4\u30D9\u30F3\u30C8\u6570
-Timeline.eventsByMoBarChart.x.dayOfMo=\u65E5
-Timeline.eventsByMoBarChart.y.numEvents=\u30A4\u30D9\u30F3\u30C8\u6570
-Timeline.node.emptyRoot=\u7A7A\u306E\u30EB\u30FC\u30C8
-Timeline.resultPanel.loading=\u30ED\u30FC\u30C9\u4E2D\u2026
-Timeline.node.root=\u30EB\u30FC\u30C8
-Timeline.propChg.confDlg.timelineOOD.msg=\u30BF\u30A4\u30E0\u30E9\u30A4\u30F3\u304C\u6700\u65B0\u3067\u306F\u3042\u308A\u307E\u305B\u3093\u3002\u518D\u5EA6\u4F5C\u6210\u3057\u307E\u3059\u304B\uFF1F
-Timeline.propChg.confDlg.timelineOOD.details=\u30AA\u30D7\u30B7\u30E7\u30F3\u3092\u9078\u629E\u3057\u3066\u4E0B\u3055\u3044
-Timeline.initTimeline.confDlg.genBeforeIngest.msg=\u30A4\u30F3\u30B8\u30A7\u30B9\u30C8\u304C\u5B8C\u4E86\u3059\u308B\u524D\u306B\u30BF\u30A4\u30E0\u30E9\u30A4\u30F3\u3092\u4F5C\u6210\u3057\u3088\u3046\u3068\u3057\u3066\u3044\u307E\u3059\u3002\u30BF\u30A4\u30E0\u30E9\u30A4\u30F3\u304C\u4E0D\u5B8C\u5168\u306B\u306A\u308B\u304B\u3082\u3057\u308C\u307E\u305B\u3093\u3002\u7D9A\u884C\u3057\u307E\u3059\u304B\uFF1F
-Timeline.initTimeline.confDlg.genBeforeIngest.deails=\u30BF\u30A4\u30E0\u30E9\u30A4\u30F3
-TimelineProgressDialog.setName.text=\u30BF\u30A4\u30E0\u30E9\u30A4\u30F3\u3092\u4F5C\u6210\uFF08\u30D9\u30FC\u30BF\uFF09
\ No newline at end of file
diff --git a/Core/src/org/sleuthkit/autopsy/timeline/Timeline.java b/Core/src/org/sleuthkit/autopsy/timeline/Timeline.java
deleted file mode 100644
index 0e8cb2111060b7fa3663a541fb6cd0c5df30b587..0000000000000000000000000000000000000000
--- a/Core/src/org/sleuthkit/autopsy/timeline/Timeline.java
+++ /dev/null
@@ -1,1237 +0,0 @@
-/*
- * Autopsy Forensic Browser
- *
- * Copyright 2013 Basis Technology Corp.
- * Contact: carrier <at> sleuthkit <dot> org
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.sleuthkit.autopsy.timeline;
-
-import java.awt.Component;
-import java.awt.Cursor;
-import java.awt.Dimension;
-import java.awt.EventQueue;
-import java.beans.PropertyChangeEvent;
-import java.beans.PropertyChangeListener;
-import java.io.BufferedWriter;
-import java.io.FileInputStream;
-import java.io.FileNotFoundException;
-import java.io.FileWriter;
-import java.io.IOException;
-import java.io.Writer;
-import java.text.DateFormat;
-import java.text.DateFormatSymbols;
-import java.text.ParseException;
-import java.text.SimpleDateFormat;
-import java.util.ArrayList;
-import java.util.Calendar;
-import java.util.Date;
-import java.util.List;
-import java.util.Locale;
-import java.util.Scanner;
-import java.util.Stack;
-import java.util.TimeZone;
-import java.util.logging.Level;
-import java.util.prefs.Preferences;
-import javafx.application.Platform;
-import javafx.beans.value.ChangeListener;
-import javafx.beans.value.ObservableValue;
-import javafx.collections.FXCollections;
-import javafx.collections.ObservableList;
-import javafx.embed.swing.JFXPanel;
-import javafx.event.ActionEvent;
-import javafx.event.EventHandler;
-import javafx.geometry.Pos;
-import javafx.scene.Group;
-import javafx.scene.Scene;
-import javafx.scene.chart.BarChart;
-import javafx.scene.chart.CategoryAxis;
-import javafx.scene.chart.NumberAxis;
-import javafx.scene.control.Button;
-import javafx.scene.control.ComboBox;
-import javafx.scene.control.Label;
-import javafx.scene.control.ScrollPane;
-import javafx.scene.input.MouseButton;
-import javafx.scene.input.MouseEvent;
-import javafx.scene.layout.HBox;
-import javafx.scene.layout.VBox;
-import javafx.scene.paint.Color;
-import javax.swing.JFrame;
-import javax.swing.JOptionPane;
-import javax.swing.SwingUtilities;
-import org.netbeans.api.progress.ProgressHandle;
-import org.netbeans.api.progress.ProgressHandleFactory;
-import org.openide.awt.ActionID;
-import org.openide.awt.ActionReference;
-import org.openide.awt.ActionReferences;
-import org.openide.awt.ActionRegistration;
-import org.openide.modules.InstalledFileLocator;
-import org.openide.nodes.Children;
-import org.openide.nodes.Node;
-import org.openide.util.HelpCtx;
-import org.openide.util.NbBundle;
-import org.openide.util.NbPreferences;
-import org.openide.util.actions.CallableSystemAction;
-import org.openide.util.actions.Presenter;
-import org.openide.util.lookup.Lookups;
-import org.openide.windows.WindowManager;
-import org.sleuthkit.autopsy.casemodule.Case;
-import org.sleuthkit.autopsy.core.Installer;
-import org.sleuthkit.autopsy.corecomponents.DataContentPanel;
-import org.sleuthkit.autopsy.corecomponents.DataResultPanel;
-import org.sleuthkit.autopsy.coreutils.Logger;
-import org.sleuthkit.autopsy.coreutils.PlatformUtil;
-import org.sleuthkit.autopsy.datamodel.FilterNodeLeaf;
-import org.sleuthkit.autopsy.datamodel.DirectoryNode;
-import org.sleuthkit.autopsy.datamodel.DisplayableItemNode;
-import org.sleuthkit.autopsy.datamodel.DisplayableItemNodeVisitor;
-import org.sleuthkit.autopsy.datamodel.FileNode;
-import org.sleuthkit.autopsy.ingest.IngestManager;
-import org.sleuthkit.autopsy.coreutils.ExecUtil;
-import org.sleuthkit.autopsy.datamodel.ContentUtils;
-import org.sleuthkit.datamodel.AbstractFile;
-import org.sleuthkit.datamodel.SleuthkitCase;
-import org.sleuthkit.datamodel.TskCoreException;
-
-@ActionID(category = "Tools", id = "org.sleuthkit.autopsy.timeline.Timeline")
-@ActionRegistration(displayName = "#CTL_MakeTimeline", lazy = false)
-@ActionReferences(value = {
-    @ActionReference(path = "Menu/Tools", position = 100)})
-//@NbBundle.Messages(value = "CTL_TimelineView=Generate Timeline")
-/**
- * The Timeline Action entry point. Collects data and pushes data to javafx
- * widgets
- *
- */
-public class Timeline extends CallableSystemAction implements Presenter.Toolbar, PropertyChangeListener {
- 
-    private static final Logger logger = Logger.getLogger(Timeline.class.getName());
-    private final java.io.File macRoot = InstalledFileLocator.getDefault().locate("mactime", Timeline.class.getPackage().getName(), false); //NON-NLS
-    private TimelineFrame mainFrame;          //frame for holding all the elements
-    private Group fxGroupCharts; //Orders the charts
-    private Scene fxSceneCharts; //Displays the charts
-    private HBox fxHBoxCharts;      //Holds the navigation buttons in horiztonal fashion. 
-    private VBox fxVBox;        //Holds the JavaFX Elements in vertical fashion. 
-    private JFXPanel fxPanelCharts;  //FX panel to hold the group
-    private BarChart<String, Number> fxChartEvents;      //Yearly/Monthly events - Bar chart
-    private ScrollPane fxScrollEvents;  //Scroll Panes for dealing with oversized an oversized chart
-    private static final int FRAME_HEIGHT = 700; //Sizing constants
-    private static final int FRAME_WIDTH = 1200;
-    private Button fxZoomOutButton;  //Navigation buttons
-    private ComboBox<String> fxDropdownSelectYears; //Dropdown box for selecting years. Useful when the charts' scale means some years are unclickable, despite having events.
-    private final Stack<BarChart<String, Number>> fxStackPrevCharts = new Stack<BarChart<String, Number>>();  //Stack for storing drill-up information.
-    private BarChart<String, Number> fxChartTopLevel; //the topmost chart, used for resetting to default view.
-    private BarChart<String, Number> fxMonthView; //the month chart
-    private DataResultPanel dataResultPanel;
-    private DataContentPanel dataContentPanel;
-    private ProgressHandle progress;
-    private java.io.File moduleDir;
-    private String mactimeFileName;
-    private List<YearEpoch> data;
-    private boolean listeningToAddImage = false;
-    private long lastObjectId = -1;
-    private TimelineProgressDialog progressDialog;
-    private EventHandler<MouseEvent> fxMouseEnteredListener;
-    private EventHandler<MouseEvent> fxMouseExitedListener;
-    private SleuthkitCase skCase;
-    private boolean fxInited = false;
-    private int monthCounter = 0;
-
-    public Timeline() {
-        super();
-
-        fxInited = Installer.isJavaFxInited();
-       // TimeZone.setDefault(TimeZone.getTimeZone("UTC")); //sets the default timezone to UTC unless otherwise stated
-    }
-
-    //Swing components and JavafX components don't play super well together
-    //Swing components need to be initialized first, in the swing specific thread
-    //Next, the javafx components may be initialized.
-    private void customize() {
-
-        //listeners
-        fxMouseEnteredListener = new EventHandler<MouseEvent>() {
-            @Override
-            public void handle(MouseEvent e) {
-                fxPanelCharts.setCursor(Cursor.getPredefinedCursor(Cursor.HAND_CURSOR));
-            }
-        };
-        fxMouseExitedListener = new EventHandler<MouseEvent>() {
-            @Override
-            public void handle(MouseEvent e) {
-                fxPanelCharts.setCursor(null);
-            }
-        };
-
-        SwingUtilities.invokeLater(new Runnable() {
-            @Override
-            public void run() {
-                //Making the main frame *
-
-                mainFrame = new TimelineFrame();
-                mainFrame.setFrameName(
-                        NbBundle.getMessage(this.getClass(), "Timeline.frameName.text", Case.getCurrentCase().getName()));
-
-                //use the same icon on jframe as main application
-                mainFrame.setIconImage(WindowManager.getDefault().getMainWindow().getIconImage());
-                mainFrame.setFrameSize(new Dimension(FRAME_WIDTH, FRAME_HEIGHT)); //(Width, Height)
-
-
-                dataContentPanel = DataContentPanel.createInstance();
-                //dataContentPanel.setAlignmentX(Component.RIGHT_ALIGNMENT);
-                //dataContentPanel.setPreferredSize(new Dimension(FRAME_WIDTH, (int) (FRAME_HEIGHT * 0.4)));
-
-                dataResultPanel = DataResultPanel.createInstance(
-                        NbBundle.getMessage(this.getClass(), "Timeline.resultsPanel.title"),
-                        "", Node.EMPTY, 0, dataContentPanel);
-                dataResultPanel.setContentViewer(dataContentPanel);
-                //dataResultPanel.setAlignmentX(Component.LEFT_ALIGNMENT);
-                //dataResultPanel.setPreferredSize(new Dimension((int)(FRAME_WIDTH * 0.5), (int) (FRAME_HEIGHT * 0.5)));
-                logger.log(Level.INFO, "Successfully created viewers"); //NON-NLS
-
-                mainFrame.setBottomLeftPanel(dataResultPanel);
-                mainFrame.setBottomRightPanel(dataContentPanel);
-
-                runJavaFxThread();
-            }
-        });
-
-
-    }
-
-    private void runJavaFxThread() {
-        //JavaFX thread
-        //JavaFX components MUST be run in the JavaFX thread, otherwise massive amounts of exceptions will be thrown and caught. Liable to freeze up and crash.
-        //Components can be declared whenever, but initialization and manipulation must take place here.
-        Platform.runLater(new Runnable() {
-            @Override
-            public void run() {
-                try {
-                    // start the progress bar
-                    progress = ProgressHandleFactory.createHandle(
-                            NbBundle.getMessage(this.getClass(), "Timeline.runJavaFxThread.progress.creating"));
-                    progress.start();
-
-                    fxChartEvents = null; //important to reset old data
-                    fxPanelCharts = new JFXPanel();
-                    fxGroupCharts = new Group();
-                    fxSceneCharts = new Scene(fxGroupCharts, FRAME_WIDTH, FRAME_HEIGHT * 0.6); //Width, Height
-                    fxVBox = new VBox(5);
-                    fxVBox.setAlignment(Pos.BOTTOM_CENTER);
-                    fxHBoxCharts = new HBox(10);
-                    fxHBoxCharts.setAlignment(Pos.BOTTOM_CENTER);
-
-                    //Initializing default values for the scroll pane
-                    fxScrollEvents = new ScrollPane();
-                    fxScrollEvents.setPrefSize(FRAME_WIDTH, FRAME_HEIGHT * 0.6); //Width, Height
-                    fxScrollEvents.setContent(null); //Needs some content, otherwise it crashes
-
-                    // set up moduleDir
-                    moduleDir = new java.io.File(Case.getCurrentCase().getModulesOutputDirAbsPath() + java.io.File.separator + "timeline");
-                    if (!moduleDir.exists()) {
-                        moduleDir.mkdir();
-                    }
-
-                    int currentProgress = 0;
-                    java.io.File mactimeFile = new java.io.File(moduleDir, mactimeFileName);
-                    if (!mactimeFile.exists()) {
-                        progressDialog.setProgressTotal(3); //total 3 units
-                        logger.log(Level.INFO, "Creating body file"); //NON-NLS
-                        progressDialog.updateProgressBar(
-                                NbBundle.getMessage(this.getClass(), "Timeline.runJavaFxThread.progress.genBodyFile"));
-                        String bodyFilePath = makeBodyFile();
-                        progressDialog.updateProgressBar(++currentProgress);
-                        logger.log(Level.INFO, "Creating mactime file: " + mactimeFile.getAbsolutePath()); //NON-NLS
-                        progressDialog.updateProgressBar(
-                                NbBundle.getMessage(this.getClass(), "Timeline.runJavaFxThread.progress.genMacTime"));
-                        makeMacTime(bodyFilePath);
-                        progressDialog.updateProgressBar(++currentProgress);
-                        data = null;
-                    } else {
-                        progressDialog.setProgressTotal(1); //total 1 units
-                        logger.log(Level.INFO, "Mactime file already exists; parsing that: " + mactimeFile.getAbsolutePath()); //NON-NLS
-                    }
-
-
-                    progressDialog.updateProgressBar(
-                            NbBundle.getMessage(this.getClass(), "Timeline.runJavaFxThread.progress.parseMacTime"));
-                    if (data == null) {
-                        logger.log(Level.INFO, "Parsing mactime file: " + mactimeFile.getAbsolutePath()); //NON-NLS
-                        data = parseMacTime(mactimeFile); //The sum total of the mactime parsing.  YearEpochs contain everything you need to make a timeline.
-                    }
-                    progressDialog.updateProgressBar(++currentProgress);
-
-                    //Making a dropdown box to select years.
-                    List<String> lsi = new ArrayList<String>();  //List is in the format of {Year : Number of Events}, used for selecting from the dropdown.
-                    for (YearEpoch ye : data) {
-                        lsi.add(ye.year + " : " + ye.getNumFiles());
-                    }
-                    ObservableList<String> listSelect = FXCollections.observableArrayList(lsi);
-                    fxDropdownSelectYears = new ComboBox<String>(listSelect);
-
-                    //Buttons for navigating up and down the timeline
-                    fxZoomOutButton = new Button(NbBundle.getMessage(this.getClass(), "Timeline.zoomOutButton.text"));
-                    fxZoomOutButton.setOnAction(new EventHandler<ActionEvent>() {
-                        @Override
-                        public void handle(ActionEvent e) {
-                            BarChart<String, Number> bc;
-                            if (fxStackPrevCharts.size() == 0) {
-                                bc = fxChartTopLevel;
-                            } else {
-                                bc = fxStackPrevCharts.pop();                             
-                            }
-                            fxChartEvents = bc;
-                            fxScrollEvents.setContent(fxChartEvents);
-                        }
-                    });
-
-                    fxDropdownSelectYears.getSelectionModel().selectedItemProperty().addListener(new ChangeListener<String>() {
-                        @Override
-                        public void changed(ObservableValue<? extends String> ov, String t, String t1) {
-                            if (fxDropdownSelectYears.getValue() != null) {
-                                mainFrame.setTopComponentCursor(Cursor.getPredefinedCursor(Cursor.WAIT_CURSOR));
-                                try {
-                                    fxChartEvents = createMonthsWithDrill(findYear(data, Integer.valueOf(fxDropdownSelectYears.getValue().split(" ")[0])));
-                                    fxScrollEvents.setContent(fxChartEvents);
-                                } finally {
-                                    mainFrame.setTopComponentCursor(null);
-                                }
-                            }
-                        }
-                    });
-
-                    //Adding things to the V and H boxes. 
-                    //hBox_Charts stores the pseudo menu bar at the top of the timeline. |Zoom Out|View Year: [Select Year]|►|
-                    fxHBoxCharts.getChildren().addAll(fxZoomOutButton, new Label(
-                            NbBundle.getMessage(this.getClass(), "Timeline.goToButton.text")), fxDropdownSelectYears);
-                    fxVBox.getChildren().addAll(fxHBoxCharts, fxScrollEvents); //FxBox_V holds things in a visual stack. 
-                    fxGroupCharts.getChildren().add(fxVBox); //Adding the FxBox to the group. Groups make things easier to manipulate without having to update a hundred things every change.
-                    fxPanelCharts.setScene(fxSceneCharts);
-
-
-                    fxPanelCharts.setAlignmentX(Component.LEFT_ALIGNMENT);
-
-                    fxChartTopLevel = createYearChartWithDrill(data);
-                    fxChartEvents = fxChartTopLevel;
-                    fxScrollEvents.setContent(fxChartEvents);
-
-                    EventQueue.invokeLater(new Runnable() {
-                        @Override
-                        public void run() {
-                            mainFrame.setTopPanel(fxPanelCharts);
-                            dataResultPanel.open();
-                            //mainFrame.pack();
-                            mainFrame.setVisible(true);
-                        }
-                    });
-                } finally {
-                    // stop the progress bar
-                    progress.finish();
-
-                    // close the progressDialog
-                    progressDialog.doClose(0);
-                }
-            }
-        });
-    }
-
-    /**
-     * Creates a BarChart with datapoints for all the years from the parsed
-     * mactime file.
-     *
-     * @param allYears The list of years that have barData from the mactime file
-     * @return BarChart scaled to the year level
-     */
-    private BarChart<String, Number> createYearChartWithDrill(final List<YearEpoch> allYears) {
-        final CategoryAxis xAxis = new CategoryAxis(); //Axes are very specific types. Categorys are strings.
-        final NumberAxis yAxis = new NumberAxis();
-        final Label l = new Label("");
-        l.setStyle("-fx-font: 24 arial;"); //NON-NLS
-        l.setTextFill(Color.AZURE);
-        xAxis.setLabel(NbBundle.getMessage(this.getClass(), "Timeline.yearBarChart.x.years"));
-        yAxis.setLabel(NbBundle.getMessage(this.getClass(), "Timeline.yearBarChart.y.numEvents"));
-        //Charts are made up of individual pieces of Chart.Data. In this case, a piece of barData is a single bar on the graph.
-        //Data is packaged into a series, which can be assigned custom colors or styling
-        //After the series are created, 1 or more series are packaged into a single chart.
-        ObservableList<BarChart.Series<String, Number>> bcData = FXCollections.observableArrayList();
-        BarChart.Series<String, Number> se = new BarChart.Series<String, Number>();
-        if (allYears != null) {
-            for (final YearEpoch ye : allYears) {
-                se.getData().add(new BarChart.Data<String, Number>(String.valueOf(ye.year), ye.getNumFiles()));
-            }
-        }
-        bcData.add(se);
-
-
-        //Note: 
-        // BarChart.Data wraps the Java Nodes class. BUT, until a BarChart.Data gets added to an actual series, it's node is null, and you can perform no operations on it.
-        // When the Data is added to a series(or a chart? I am unclear on where), a node is automaticaly generated for it, after which you can perform any of the operations it offers. 
-        // In addtion, you are free to set the node to whatever you want. It wraps the most generic Node class.
-        // But it is for this reason that the chart generating functions have two forloops. I do not believe they can be condensed into a single loop due to the nodes being null until 
-        // an undetermined point in time. 
-        BarChart<String, Number> bc = new BarChart<String, Number>(xAxis, yAxis, bcData);
-        for (final BarChart.Data<String, Number> barData : bc.getData().get(0).getData()) { //.get(0) refers to the BarChart.Series class to work on. There is only one series in this graph, so get(0) is safe.
-            barData.getNode().setScaleX(.5);
-
-            final javafx.scene.Node barNode = barData.getNode();
-            //hover listener
-            barNode.addEventHandler(MouseEvent.MOUSE_ENTERED_TARGET, fxMouseEnteredListener);
-            barNode.addEventHandler(MouseEvent.MOUSE_EXITED_TARGET, fxMouseExitedListener);
-
-            //click listener
-            barNode.addEventHandler(MouseEvent.MOUSE_CLICKED,
-                    new EventHandler<MouseEvent>() {
-                @Override
-                public void handle(MouseEvent e) {
-                    if (e.getButton().equals(MouseButton.PRIMARY)) {
-                        if (e.getClickCount() == 1) {
-                            Platform.runLater(new Runnable() {
-                                @Override
-                                public void run() {
-                                    BarChart<String, Number> b =
-                                            createMonthsWithDrill(findYear(allYears, Integer.valueOf(barData.getXValue())));
-                                    fxChartEvents = b;
-                                    fxScrollEvents.setContent(fxChartEvents);
-                                }
-                            });
-
-                        }
-                    }
-                }
-            });
-        }
-
-        bc.autosize(); //Get an auto height
-        bc.setPrefWidth(FRAME_WIDTH);  //but override the width
-        bc.setLegendVisible(false); //The legend adds too much extra chart space, it's not necessary.
-        return bc;
-    }
-
-    /*
-     * Displays a chart with events from one year only, separated into 1-month chunks.
-     * Always 12 per year, empty months are represented by no bar.
-     */
-    private BarChart<String, Number> createMonthsWithDrill(final YearEpoch ye) {
-        final CategoryAxis xAxis = new CategoryAxis();
-        final NumberAxis yAxis = new NumberAxis();
-        xAxis.setLabel(NbBundle.getMessage(this.getClass(), "Timeline.MonthsBarChart.x.monthYY", ye.year));
-        yAxis.setLabel(NbBundle.getMessage(this.getClass(), "Timeline.MonthsBarChart.y.numEvents"));
-        ObservableList<BarChart.Series<String, Number>> bcData = FXCollections.observableArrayList();
-
-        BarChart.Series<String, Number> se = new BarChart.Series<String, Number>();
-        for (int monthNum = 0; monthNum < 12; ++monthNum) {
-            String monthName = new DateFormatSymbols().getMonths()[monthNum];
-            MonthEpoch month = ye.getMonth(monthNum);
-            int numEvents = month == null ? 0 : month.getNumFiles();
-            se.getData().add(new BarChart.Data<String, Number>(monthName, numEvents)); //Adding new barData at {X-pos, Y-Pos}
-        }
-        bcData.add(se);
-        final BarChart<String, Number> bc = new BarChart<String, Number>(xAxis, yAxis, bcData);
-
-        for (int i = 0; i < 12; i++) {
-            for (final BarChart.Data<String, Number> barData : bc.getData().get(0).getData()) {
-                //Note: 
-                // All the charts of this package have a problem where when the chart gets below a certain pixel ratio, the barData stops drawing. The axes and the labels remain, 
-                // But the actual chart barData is invisible, unclickable, and unrendered. To partially compensate for that, barData.getNode() can be manually scaled up to increase visibility.
-                // Sometimes I've had it jacked up to as much as x2400 just to see a sliver of information.
-                // But that doesn't work all the time. Adding it to a scrollpane and letting the user scroll up and down to view the chart is the other workaround. Both of these fixes suck.
-                final javafx.scene.Node barNode = barData.getNode();
-                barNode.setScaleX(.5);
-
-                //hover listener
-                barNode.addEventHandler(MouseEvent.MOUSE_ENTERED_TARGET, fxMouseEnteredListener);
-                barNode.addEventHandler(MouseEvent.MOUSE_EXITED_TARGET, fxMouseExitedListener);
-
-                //clicks
-                barNode.addEventHandler(MouseEvent.MOUSE_PRESSED,
-                        new EventHandler<MouseEvent>() {
-                    @Override
-                    public void handle(MouseEvent e) {
-                        if (e.getButton().equals(MouseButton.PRIMARY)) {
-                            if (e.getClickCount() == 1) {
-                                Platform.runLater(new Runnable() {
-                                    @Override
-                                    public void run() {
-                                        fxChartEvents = createEventsByMonth(findMonth(ye.months, monthStringToInt(barData.getXValue())), ye);
-                                        fxScrollEvents.setContent(fxChartEvents);
-                                    }
-                                });
-                            }
-                        }
-                    }
-                });
-            }
-        }
-
-        bc.autosize();
-        bc.setPrefWidth(FRAME_WIDTH);
-        bc.setLegendVisible(false);
-        fxMonthView= bc;
-        return bc;
-    }
-
-
-    /*
-     * Displays a chart with events from one month only.
-     * Up to 31 days per month, as low as 28 as determined by the specific MonthEpoch
-     */
-    @SuppressWarnings("unchecked")
-    private BarChart<String, Number> createEventsByMonth(final MonthEpoch me, final YearEpoch ye) {
-        final CategoryAxis xAxis = new CategoryAxis();
-        final NumberAxis yAxis = new NumberAxis();
-        xAxis.setLabel(NbBundle.getMessage(this.getClass(), "Timeline.eventsByMoBarChart.x.dayOfMo"));
-        yAxis.setLabel(NbBundle.getMessage(this.getClass(), "Timeline.eventsByMoBarChart.y.numEvents"));
-        ObservableList<BarChart.Data<String, Number>> bcData = makeObservableListByMonthAllDays(me, ye.getYear());
-        BarChart.Series<String, Number> series = new BarChart.Series<String, Number>(bcData);
-        series.setName(me.getMonthName() + " " + ye.getYear());
-
-
-        ObservableList<BarChart.Series<String, Number>> ol =
-                FXCollections.<BarChart.Series<String, Number>>observableArrayList(series);
-
-        final BarChart<String, Number> bc = new BarChart<String, Number>(xAxis, yAxis, ol);
-        for (final BarChart.Data<String, Number> barData : bc.getData().get(0).getData()) {
-            //data.getNode().setScaleX(2);
-
-            final javafx.scene.Node barNode = barData.getNode();
-
-            //hover listener
-            barNode.addEventHandler(MouseEvent.MOUSE_ENTERED_TARGET, fxMouseEnteredListener);
-            barNode.addEventHandler(MouseEvent.MOUSE_EXITED_TARGET, fxMouseExitedListener);
-
-            barNode.addEventHandler(MouseEvent.MOUSE_PRESSED,
-                    new EventHandler<MouseEvent>() {
-                MonthEpoch myme = me;
-
-                @Override
-                public void handle(MouseEvent e) {
-                     SwingUtilities.invokeLater(new Runnable() {
-                        @Override
-                        public void run() {
-                            //reset the view and free the current nodes before loading new ones
-                            final FileRootNode d = new FileRootNode(
-                                    NbBundle.getMessage(this.getClass(), "Timeline.node.emptyRoot"), new ArrayList<Long>());
-                            dataResultPanel.setNode(d);
-                            dataResultPanel.setPath(NbBundle.getMessage(this.getClass(), "Timeline.resultPanel.loading"));
-                        }
-                    });
-                    final int day = (Integer.valueOf((barData.getXValue()).split("-")[1]));
-                    final DayEpoch de = myme.getDay(day);
-                    final List<Long> afs;
-                    if (de != null) {
-                        afs = de.getEvents();
-                    } else {
-                        logger.log(Level.SEVERE, "There were no events for the clicked-on day: " + day); //NON-NLS
-                        return;
-                    }
-
-                    SwingUtilities.invokeLater(new Runnable() {
-                        @Override
-                        public void run() {
-                            final FileRootNode d = new FileRootNode(
-                                    NbBundle.getMessage(this.getClass(), "Timeline.node.root"), afs);
-                            dataResultPanel.setNode(d);
-                            //set result viewer title path with the current date
-                            String dateString = ye.getYear() + "-" + (1 + me.getMonthInt()) + "-" + +de.dayNum;
-                            dataResultPanel.setPath(dateString);
-                        }
-                    });
-
-
-                }
-            });
-        }
-        bc.autosize();
-        bc.setPrefWidth(FRAME_WIDTH); 
-        monthCounter++;
-        if (monthCounter==12)
-        {
-        fxStackPrevCharts.push(fxMonthView);
-        monthCounter=0;
-        }
-        return bc;
-    }
-
-    private static ObservableList<BarChart.Data<String, Number>> makeObservableListByMonthAllDays(final MonthEpoch me, int year) {
-        ObservableList<BarChart.Data<String, Number>> bcData = FXCollections.observableArrayList();
-        int totalDays = me.getTotalNumDays(year);
-        for (int i = 1; i <= totalDays; ++i) {
-            DayEpoch day = me.getDay(i);
-            int numFiles = day == null ? 0 : day.getNumFiles();
-            BarChart.Data<String, Number> d = new BarChart.Data<String, Number>(me.month + 1 + "-" + i, numFiles);
-            d.setExtraValue(me);
-            bcData.add(d);
-        }
-        return bcData;
-    }
-
-    /*
-     * Section for Utility functions
-     */
-    /**
-     *
-     * @param mon The month to convert. Must be minimum 4 characters long
-     * "February" and "Febr" are acceptable.
-     * @return The integer value of the month. February = 1, July = 6
-     */
-    private static int monthStringToInt(String mon) {
-        try {
-            Date date = new SimpleDateFormat("MMMM", Locale.ENGLISH).parse(mon);
-            Calendar cal = Calendar.getInstance();
-            cal.setTime(date);
-            return cal.get(Calendar.MONTH);
-        } catch (ParseException ex) {
-            logger.log(Level.WARNING, "Unable to convert string " + mon + " to integer", ex); //NON-NLS
-            return -1;
-        }
-    }
-
-    /**
-     * Used for finding the proper month in a list of available months
-     *
-     * @param lst The list of months to search through. It is assumed that the
-     * desired match is in this list.
-     * @param match The month, in integer format, to retrieve.
-     * @return The month epoch as specified by match.
-     */
-    private static MonthEpoch findMonth(List<MonthEpoch> lst, int match) {
-        for (MonthEpoch e : lst) {
-            if (e.month == match) {
-                return e;
-            }
-        }
-        return null;
-    }
-
-    /**
-     * Used for finding the proper year in a list of available years
-     *
-     * @param lst The list of years to search through. It is assumed that the
-     * desired match is in this list.
-     * @param match The year to retrieve.
-     * @return The year epoch as specified by match.
-     */
-    private static YearEpoch findYear(List<YearEpoch> lst, int match) {
-        for (YearEpoch e : lst) {
-            if (e.year == match) {
-                return e;
-            }
-        }
-        return null;
-    }
-
-    @Override
-    public void propertyChange(PropertyChangeEvent evt) {
-        String prop = evt.getPropertyName();
-        if (prop.equals(Case.Events.DATA_SOURCE_ADDED.toString())) {
-            if (mainFrame != null && !mainFrame.isVisible()) {
-                // change the lastObjectId to trigger a reparse of mactime barData
-                ++lastObjectId;
-                return;
-            }
-
-            int answer = JOptionPane.showConfirmDialog(mainFrame,
-                                                       NbBundle.getMessage(this.getClass(),
-                                                                           "Timeline.propChg.confDlg.timelineOOD.msg"),
-                                                       NbBundle.getMessage(this.getClass(),
-                                                                           "Timeline.propChg.confDlg.timelineOOD.details"),
-                                                       JOptionPane.YES_NO_OPTION);
-            if (answer != JOptionPane.YES_OPTION) {
-                return;
-            }
-
-            clearMactimeData();
-
-            // call performAction as if the user selected 'Make Timeline' from the menu
-            performAction();
-        } else if (prop.equals(Case.Events.CURRENT_CASE.toString())) {
-            if (mainFrame != null && mainFrame.isVisible()) {
-                mainFrame.dispose();
-                mainFrame = null;
-            }
-
-            data = null;
-        }
-    }
-
-    private void clearMactimeData() {
-        // get rid of the old barData
-        data = null;
-
-        // get rid of the mactime file
-        java.io.File mactimeFile = new java.io.File(moduleDir, mactimeFileName);
-        mactimeFile.delete();
-
-        // close the jframe
-        if (mainFrame != null) {
-            mainFrame.setVisible(false);
-            mainFrame.dispose();
-            mainFrame = null;
-        }
-
-        // remove ourself as change listener on Case
-        Case.removePropertyChangeListener(this);
-        listeningToAddImage = false;
-
-    }
-
-    /*
-     * The backbone of the timeline functionality, years are split into months, months into days, and days contain the events of that given day.
-     * All of those are Epochs.
-     */
-    abstract class Epoch {
-
-        abstract public int getNumFiles();
-    }
-
-    private class YearEpoch extends Epoch {
-
-        private int year;
-        private List<MonthEpoch> months = new ArrayList<>();
-
-        YearEpoch(int year) {
-            this.year = year;
-        }
-
-        public int getYear() {
-            return year;
-        }
-
-        @Override
-        public int getNumFiles() {
-            int size = 0;
-            for (MonthEpoch me : months) {
-                size += me.getNumFiles();
-            }
-            return size;
-        }
-
-        public MonthEpoch getMonth(int monthNum) {
-            MonthEpoch month = null;
-            for (MonthEpoch me : months) {
-                if (me.getMonthInt() == monthNum) {
-                    month = me;
-                    break;
-                }
-            }
-            return month;
-        }
-
-        public void add(long fileId, int month, int day) {
-            // see if this month is in the list
-            MonthEpoch monthEpoch = null;
-            for (MonthEpoch me : months) {
-                if (me.getMonthInt() == month) {
-                    monthEpoch = me;
-                    break;
-                }
-            }
-
-            if (monthEpoch == null) {
-                monthEpoch = new MonthEpoch(month);
-                months.add(monthEpoch);
-            }
-
-            // add the file the the MonthEpoch object
-            monthEpoch.add(fileId, day);
-        }
-    }
-
-    private class MonthEpoch extends Epoch {
-
-        private int month; //Zero-indexed: June = 5, August = 7, etc
-        private List<DayEpoch> days = new ArrayList<>(); //List of DayEpochs in this month, max 31
-
-        MonthEpoch(int month) {
-            this.month = month;
-        }
-
-        public int getMonthInt() {
-            return month;
-        }
-
-        public int getTotalNumDays(int year) {
-            Calendar cal = Calendar.getInstance();
-            cal.set(year, month, 1);
-            return cal.getActualMaximum(Calendar.DAY_OF_MONTH);
-        }
-
-        @Override
-        public int getNumFiles() {
-            int numFiles = 0;
-            for (DayEpoch de : days) {
-                numFiles += de.getNumFiles();
-            }
-            return numFiles;
-        }
-
-        public DayEpoch getDay(int dayNum) {
-            DayEpoch de = null;
-            for (DayEpoch d : days) {
-                if (d.dayNum == dayNum) {
-                    de = d;
-                    break;
-                }
-            }
-            return de;
-        }
-
-        public void add(long fileId, int day) {
-            DayEpoch dayEpoch = null;
-            for (DayEpoch de : days) {
-                if (de.getDayInt() == day) {
-                    dayEpoch = de;
-                    break;
-                }
-            }
-
-            if (dayEpoch == null) {
-                dayEpoch = new DayEpoch(day);
-                days.add(dayEpoch);
-            }
-
-            dayEpoch.add(fileId);
-        }
-
-        /**
-         * Returns the month's name in String format, e.g., September, July,
-         */
-        String getMonthName() {
-            return new DateFormatSymbols().getMonths()[month];
-        }
-
-        /**
-         * @return the list of days in this month
-         */
-        List<DayEpoch> getDays() {
-            return this.days;
-        }
-    }
-
-    private class DayEpoch extends Epoch {
-
-        private final List<Long> fileIds = new ArrayList<>();
-        int dayNum = 0; //Day of the month this Epoch represents, 1 indexed: 28=28.
-
-        DayEpoch(int dayOfMonth) {
-            this.dayNum = dayOfMonth;
-        }
-
-        public int getDayInt() {
-            return dayNum;
-        }
-
-        @Override
-        public int getNumFiles() {
-            return fileIds.size();
-        }
-
-        public void add(long fileId) {
-            fileIds.add(fileId);
-        }
-
-        List<Long> getEvents() {
-            return this.fileIds;
-        }
-    }
-
-    // The node factories used to make lists of files to send to the result viewer
-    // using the lazy loading (rather than background) loading option to facilitate
-    // loading a huge number of nodes for the given day
-    private class FileNodeChildFactory extends Children.Keys<Long> {
-
-        private List<Long> fileIds;
-
-        FileNodeChildFactory(List<Long> fileIds) {
-            super(true);
-            this.fileIds = fileIds;
-        }
-
-        @Override
-        protected void addNotify() {
-            super.addNotify();
-            setKeys(fileIds);
-        }
-
-        @Override
-        protected void removeNotify() {
-            super.removeNotify();
-            setKeys(new ArrayList<Long>());
-        }
-
-        @Override
-        protected Node[] createNodes(Long t) {
-            return new Node[]{createNodeForKey(t)};
-        }
-
-        //  @Override
-        //  protected boolean createKeys(List<Long> list) {
-        //     list.addAll(fileIds);
-        //     return true;
-        //  }
-        //@Override
-        protected Node createNodeForKey(Long fileId) {
-            AbstractFile af = null;
-            try {
-                af = skCase.getAbstractFileById(fileId);
-            } catch (TskCoreException ex) {
-                logger.log(Level.SEVERE, "Error getting file by id and creating a node in Timeline: " + fileId, ex); //NON-NLS
-                //no node will be shown for this object
-                return null;
-            }
-
-            Node wrapped;
-            if (af.isDir()) {
-                wrapped = new DirectoryNode(af, false);
-            } else {
-                wrapped = new FileNode(af, false);
-            }
-            return new FilterNodeLeaf(wrapped);
-        }
-    }
-
-    private class FileRootNode extends DisplayableItemNode {
-
-        FileRootNode(String NAME, List<Long> fileIds) {
-            //super(Children.create(new FileNodeChildFactory(fileIds), true));
-            super(new FileNodeChildFactory(fileIds), Lookups.singleton(fileIds));
-            super.setName(NAME);
-            super.setDisplayName(NAME);
-        }
-
-        @Override
-        public boolean isLeafTypeNode() {
-            return false;
-        }
-        
-        @Override
-        public <T> T accept(DisplayableItemNodeVisitor<T> v) {
-            return null;
-        }
-    }
-
-    /**
-     * Parse the output of mactime to break the results in to day-sized chunks (in GMT)
-     * @param f handle to mactime csv output
-     * @return 
-     */
-    private List<YearEpoch> parseMacTime(java.io.File f) {
-        List<YearEpoch> years = new ArrayList<>();
-        Scanner scan;
-        try {
-            scan = new Scanner(new FileInputStream(f));
-        } catch (FileNotFoundException ex) {
-            logger.log(Level.SEVERE, "Error: could not find mactime file.", ex); //NON-NLS
-            return years;
-        }
-        scan.useDelimiter(",");
-        scan.nextLine();   // skip the header line
-
-        int prevYear = -1;
-        YearEpoch ye = null;
-
-        while (scan.hasNextLine()) {
-            String[] s = scan.nextLine().split(","); //1999-02-08T11:08:08Z, 78706, m..b, rrwxrwxrwx, 0, 0, 8355, /img...
-            
-            // break the date into year,month,day,hour,minute, and second: Note that the ISO times are in GMT
-            String delims = "[T:Z\\-]+"; //split by the delimiters NON-NLS
-            String[] date = s[0].split(delims); //{1999,02,08,11,08,08,...}
-   
-            int year = Integer.valueOf(date[0]);
-            int month = Integer.valueOf(date[1]) - 1; //Months are zero indexed: 1 = February, 6 = July, 11 = December
-            int day = Integer.valueOf(date[2]); //Days are 1 indexed
-            int hour=Integer.valueOf(date[3]);
-            int minute=Integer.valueOf(date[4]);
-            int second=Integer.valueOf(date[5]);
-
-            Calendar calendar = Calendar.getInstance(TimeZone.getTimeZone("GMT")); //set calendar to GMT due to ISO format
-            calendar.set(year, month, day, hour, minute, second); 
-            day=calendar.get(Calendar.DAY_OF_MONTH); // this is needed or else timezone change wont work. probably incorrect optimization by compiler
-           
-            //conversion to GMT
-                
-            if (!ContentUtils.shouldDisplayTimesInLocalTime()) {
-               calendar.setTimeZone(TimeZone.getTimeZone("GMT"));
-            }
-            else{
-                calendar.setTimeZone(TimeZone.getDefault());// local timezone OF the user. should be what the user SETS at startup
-            }
-            
-            day=calendar.get(Calendar.DAY_OF_MONTH);//get the day which may be affected by timezone change
-            long ObjId = Long.valueOf(s[4]);
-
-            // when the year changes, create and add a new YearEpoch object to the list
-            if (year != prevYear) {
-                ye = new YearEpoch(year);
-                years.add(ye);
-                prevYear = year;
-            }
-
-            // save the object id along with the day
-            if (ye != null) {
-                ye.add(ObjId, month, day);
-            }
-        }
-
-        scan.close();
-
-        return years;
-    }
-
-    /**
-     * Crate a body file and return its path or null if error
-     *
-     * @return absolute path string or null if error
-     */
-    private String makeBodyFile() {
-        // Setup timestamp
-        DateFormat dateFormat = new SimpleDateFormat("MM-dd-yyyy-HH-mm-ss");
-        Date date = new Date();
-        String datenotime = dateFormat.format(date);
-
-        final Case currentCase = Case.getCurrentCase();
-
-        // Get report path
-        String bodyFilePath = moduleDir.getAbsolutePath()
-                + java.io.File.separator + currentCase.getName() + "-" + datenotime + ".txt"; //NON-NLS
-        // Run query to get all files
-        final String filesAndDirs = "name != '.' " //NON-NLS
-                + "AND name != '..'"; //NON-NLS
-        List<Long> fileIds = null;
-        try {
-            fileIds = skCase.findAllFileIdsWhere(filesAndDirs);
-        } catch (TskCoreException ex) {
-            logger.log(Level.SEVERE, "Error querying image files to make a body file: " + bodyFilePath, ex); //NON-NLS
-            return null;
-        }
-
-        // Loop files and write info to report
-        FileWriter fileWriter = null;
-        try {
-            fileWriter = new FileWriter(bodyFilePath, true);
-        } catch (IOException ex) {
-            logger.log(Level.SEVERE, "Error creating output stream to write body file to: " + bodyFilePath, ex); //NON-NLS
-            return null;
-        }
-
-        BufferedWriter out = null;
-        try {
-            out = new BufferedWriter(fileWriter);
-            for (long fileId : fileIds) {
-                AbstractFile file = skCase.getAbstractFileById(fileId);
-                // try {
-                // MD5|name|inode|mode_as_string|ObjId|GID|size|atime|mtime|ctime|crtime
-                if (file.getMd5Hash() != null) {
-                    out.write(file.getMd5Hash());
-                }
-                out.write("|");
-                String path = null;
-                try {
-                    path = file.getUniquePath();
-                } catch (TskCoreException e) {
-                    logger.log(Level.SEVERE, "Failed to get the unique path of: " + file + " and writing body file.", e); //NON-NLS
-                    return null;
-                }
-
-                out.write(path);
-
-                out.write("|");
-                out.write(Long.toString(file.getMetaAddr()));
-                out.write("|");
-                String modeString = file.getModesAsString();
-                if (modeString != null) {
-                    out.write(modeString);
-                }
-                out.write("|");
-                out.write(Long.toString(file.getId()));
-                out.write("|");
-                out.write(Long.toString(file.getGid()));
-                out.write("|");
-                out.write(Long.toString(file.getSize()));
-                out.write("|");
-                out.write(Long.toString(file.getAtime()));
-                out.write("|");
-                out.write(Long.toString(file.getMtime()));
-                out.write("|");
-                out.write(Long.toString(file.getCtime()));
-                out.write("|");
-                out.write(Long.toString(file.getCrtime()));
-                out.write("\n");
-            }
-        } catch (TskCoreException ex) {
-            logger.log(Level.SEVERE, "Error querying file by id", ex); //NON-NLS
-            return null;
-
-        } catch (IOException ex) {
-            logger.log(Level.WARNING, "Error while trying to write data to the body file.", ex); //NON-NLS
-            return null;
-        } finally {
-            if (out != null) {
-                try {
-                    out.flush();
-                    out.close();
-                } catch (IOException ex1) {
-                    logger.log(Level.WARNING, "Could not flush and/or close body file.", ex1); //NON-NLS
-                }
-            }
-        }
-
-
-        return bodyFilePath;
-    }
-
-    /**
-     * Run mactime on the given body file.  Generates CSV file with ISO dates (in GMT) 
-     * @param pathToBodyFile
-     * @return Path to output file. 
-     */
-    private String makeMacTime(String pathToBodyFile) {
-        String cmdpath = "";
-        String macpath = "";
-        String[] mactimeArgs;
-        final String machome = macRoot.getAbsolutePath();
-        pathToBodyFile = PlatformUtil.getOSFilePath(pathToBodyFile);
-        if (PlatformUtil.isWindowsOS()) {
-            macpath = machome + java.io.File.separator + "mactime.exe"; //NON-NLS
-            cmdpath = PlatformUtil.getOSFilePath(macpath);
-            mactimeArgs = new String[]{"-b", pathToBodyFile, "-d", "-y"}; //NON-NLS
-        } else {
-            cmdpath = "perl"; //NON-NLS
-            macpath = machome + java.io.File.separator + "mactime.pl"; //NON-NLS
-            mactimeArgs = new String[]{macpath, "-b", pathToBodyFile, "-d", "-y"}; //NON-NLS
-        }
-
-        String macfile = moduleDir.getAbsolutePath() + java.io.File.separator + mactimeFileName;
-        
-
-        String output = "";
-        ExecUtil execUtil = new ExecUtil();
-        Writer writer = null;
-        try {
-            //JavaSystemCaller.Exec.execute("\"" + command + "\"");
-            writer = new FileWriter(macfile);
-            execUtil.execute(writer, cmdpath, mactimeArgs);
-        } catch (InterruptedException ie) {
-            logger.log(Level.WARNING, "Mactime process was interrupted by user", ie); //NON-NLS
-            return null;
-        } catch (IOException ioe) {
-            logger.log(Level.SEVERE, "Could not create mactime file, encountered error ", ioe); //NON-NLS
-            return null;
-        } finally {
-            if (writer != null) {
-                try {
-                    writer.close();
-                } catch (IOException ex) {
-                    logger.log(Level.SEVERE, "Could not clsoe writer after creating mactime file, encountered error ", ex); //NON-NLS
-                }
-            }
-            execUtil.stop();
-        }
-
-        return macfile;
-    }
-
-    @Override
-    public boolean isEnabled() {
-        return Case.isCaseOpen() && this.fxInited;
-    }
-
-    @Override
-    public void performAction() {
-        initTimeline();
-    }
-    
-    private void initTimeline() {
-        if (!Case.existsCurrentCase()) {
-            return;
-        }
-
-        final Case currentCase = Case.getCurrentCase();
-        skCase = currentCase.getSleuthkitCase();
-
-        try {
-            if (currentCase.hasData() == false) {
-                logger.log(Level.INFO, "Error creating timeline, there are no data sources. "); //NON-NLS
-            } else {
-
-                if (IngestManager.getInstance().isIngestRunning()) {
-                    int answer = JOptionPane.showConfirmDialog(new JFrame(),
-                                                               NbBundle.getMessage(this.getClass(),
-                                                                                   "Timeline.initTimeline.confDlg.genBeforeIngest.msg"),
-                                                               NbBundle.getMessage(this.getClass(),
-                                                                                   "Timeline.initTimeline.confDlg.genBeforeIngest.deails"),
-                                                               JOptionPane.YES_NO_OPTION);
-                    if (answer != JOptionPane.YES_OPTION) {
-                        return;
-                    }
-                }
-
-                logger.log(Level.INFO, "Beginning generation of timeline"); //NON-NLS
-
-                // if the timeline window is already open, bring to front and do nothing
-                if (mainFrame != null && mainFrame.isVisible()) {
-                    mainFrame.toFront();
-                    return;
-                }
-
-                // listen for case changes (specifically images being added).
-                if (Case.isCaseOpen() && !listeningToAddImage) {
-                    Case.addPropertyChangeListener(this);
-                    listeningToAddImage = true;
-                }
-
-                // create the modal progressDialog
-                SwingUtilities.invokeLater(new Runnable() {
-                    @Override
-                    public void run() {
-                        progressDialog = new TimelineProgressDialog(WindowManager.getDefault().getMainWindow(), true);
-                        progressDialog.setVisible(true);
-                    }
-                });
-
-                // initialize mactimeFileName
-                mactimeFileName = currentCase.getName() + "-MACTIME.txt"; //NON-NLS
-
-                // see if barData has been added to the database since the last
-                // time timeline ran
-                long objId = skCase.getLastObjectId();
-                if (objId != lastObjectId && lastObjectId != -1) {
-                    clearMactimeData();
-                }
-                lastObjectId = objId;
-
-                customize();
-            }
-        } catch (TskCoreException ex) {
-            logger.log(Level.SEVERE, "Error when generating timeline, ", ex); //NON-NLS
-        } catch (Exception ex) {
-            logger.log(Level.SEVERE, "Unexpected error when generating timeline, ", ex); //NON-NLS
-        }
-    }
-
-    @Override
-    public String getName() {
-        return NbBundle.getMessage(this.getClass(), "Timeline.getName");
-    }
-
-    @Override
-    public HelpCtx getHelpCtx() {
-        return HelpCtx.DEFAULT_HELP;
-    }
-
-    @Override
-    public boolean asynchronous() {
-        return false;
-    }
-}
diff --git a/Core/src/org/sleuthkit/autopsy/timeline/TimelineFrame.form b/Core/src/org/sleuthkit/autopsy/timeline/TimelineFrame.form
deleted file mode 100644
index 545399bf0dfbce86954fd2126b71d91d1faef608..0000000000000000000000000000000000000000
--- a/Core/src/org/sleuthkit/autopsy/timeline/TimelineFrame.form
+++ /dev/null
@@ -1,118 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-
-<Form version="1.5" maxVersion="1.8" type="org.netbeans.modules.form.forminfo.JFrameFormInfo">
-  <Properties>
-    <Property name="defaultCloseOperation" type="int" value="2"/>
-    <Property name="title" type="java.lang.String" editor="org.netbeans.modules.i18n.form.FormI18nStringEditor">
-      <ResourceString bundle="org/sleuthkit/autopsy/timeline/Bundle.properties" key="TimelineFrame.title" replaceFormat="org.openide.util.NbBundle.getMessage({sourceFileName}.class, &quot;{key}&quot;)"/>
-    </Property>
-    <Property name="preferredSize" type="java.awt.Dimension" editor="org.netbeans.beaninfo.editors.DimensionEditor">
-      <Dimension value="[1200, 700]"/>
-    </Property>
-  </Properties>
-  <SyntheticProperties>
-    <SyntheticProperty name="formSizePolicy" type="int" value="1"/>
-    <SyntheticProperty name="generateCenter" type="boolean" value="false"/>
-  </SyntheticProperties>
-  <AuxValues>
-    <AuxValue name="FormSettings_autoResourcing" type="java.lang.Integer" value="1"/>
-    <AuxValue name="FormSettings_autoSetComponentName" type="java.lang.Boolean" value="false"/>
-    <AuxValue name="FormSettings_generateFQN" type="java.lang.Boolean" value="true"/>
-    <AuxValue name="FormSettings_generateMnemonicsCode" type="java.lang.Boolean" value="true"/>
-    <AuxValue name="FormSettings_i18nAutoMode" type="java.lang.Boolean" value="true"/>
-    <AuxValue name="FormSettings_layoutCodeTarget" type="java.lang.Integer" value="1"/>
-    <AuxValue name="FormSettings_listenerGenerationStyle" type="java.lang.Integer" value="0"/>
-    <AuxValue name="FormSettings_variablesLocal" type="java.lang.Boolean" value="false"/>
-    <AuxValue name="FormSettings_variablesModifier" type="java.lang.Integer" value="2"/>
-  </AuxValues>
-
-  <Layout>
-    <DimensionLayout dim="0">
-      <Group type="103" groupAlignment="0" attributes="0">
-          <Component id="splitYPane" alignment="1" max="32767" attributes="0"/>
-      </Group>
-    </DimensionLayout>
-    <DimensionLayout dim="1">
-      <Group type="103" groupAlignment="0" attributes="0">
-          <Component id="splitYPane" alignment="1" max="32767" attributes="0"/>
-      </Group>
-    </DimensionLayout>
-  </Layout>
-  <SubComponents>
-    <Container class="javax.swing.JSplitPane" name="splitYPane">
-      <Properties>
-        <Property name="dividerLocation" type="int" value="420"/>
-        <Property name="orientation" type="int" value="0"/>
-        <Property name="resizeWeight" type="double" value="0.5"/>
-        <Property name="preferredSize" type="java.awt.Dimension" editor="org.netbeans.beaninfo.editors.DimensionEditor">
-          <Dimension value="[1024, 400]"/>
-        </Property>
-      </Properties>
-
-      <Layout class="org.netbeans.modules.form.compat2.layouts.support.JSplitPaneSupportLayout"/>
-      <SubComponents>
-        <Container class="javax.swing.JPanel" name="topPane">
-          <Properties>
-            <Property name="preferredSize" type="java.awt.Dimension" editor="org.netbeans.beaninfo.editors.DimensionEditor">
-              <Dimension value="[1200, 400]"/>
-            </Property>
-          </Properties>
-          <Constraints>
-            <Constraint layoutClass="org.netbeans.modules.form.compat2.layouts.support.JSplitPaneSupportLayout" value="org.netbeans.modules.form.compat2.layouts.support.JSplitPaneSupportLayout$JSplitPaneConstraintsDescription">
-              <JSplitPaneConstraints position="left"/>
-            </Constraint>
-          </Constraints>
-
-          <Layout class="org.netbeans.modules.form.compat2.layouts.DesignBorderLayout"/>
-        </Container>
-        <Container class="javax.swing.JSplitPane" name="splitXPane">
-          <Properties>
-            <Property name="dividerLocation" type="int" value="600"/>
-            <Property name="resizeWeight" type="double" value="0.5"/>
-            <Property name="preferredSize" type="java.awt.Dimension" editor="org.netbeans.beaninfo.editors.DimensionEditor">
-              <Dimension value="[1200, 300]"/>
-            </Property>
-            <Property name="requestFocusEnabled" type="boolean" value="false"/>
-          </Properties>
-          <Constraints>
-            <Constraint layoutClass="org.netbeans.modules.form.compat2.layouts.support.JSplitPaneSupportLayout" value="org.netbeans.modules.form.compat2.layouts.support.JSplitPaneSupportLayout$JSplitPaneConstraintsDescription">
-              <JSplitPaneConstraints position="right"/>
-            </Constraint>
-          </Constraints>
-
-          <Layout class="org.netbeans.modules.form.compat2.layouts.support.JSplitPaneSupportLayout"/>
-          <SubComponents>
-            <Container class="javax.swing.JPanel" name="leftPane">
-              <Properties>
-                <Property name="preferredSize" type="java.awt.Dimension" editor="org.netbeans.beaninfo.editors.DimensionEditor">
-                  <Dimension value="[700, 300]"/>
-                </Property>
-              </Properties>
-              <Constraints>
-                <Constraint layoutClass="org.netbeans.modules.form.compat2.layouts.support.JSplitPaneSupportLayout" value="org.netbeans.modules.form.compat2.layouts.support.JSplitPaneSupportLayout$JSplitPaneConstraintsDescription">
-                  <JSplitPaneConstraints position="left"/>
-                </Constraint>
-              </Constraints>
-
-              <Layout class="org.netbeans.modules.form.compat2.layouts.DesignBorderLayout"/>
-            </Container>
-            <Container class="javax.swing.JPanel" name="rightPane">
-              <Properties>
-                <Property name="preferredSize" type="java.awt.Dimension" editor="org.netbeans.beaninfo.editors.DimensionEditor">
-                  <Dimension value="[500, 300]"/>
-                </Property>
-              </Properties>
-              <Constraints>
-                <Constraint layoutClass="org.netbeans.modules.form.compat2.layouts.support.JSplitPaneSupportLayout" value="org.netbeans.modules.form.compat2.layouts.support.JSplitPaneSupportLayout$JSplitPaneConstraintsDescription">
-                  <JSplitPaneConstraints position="right"/>
-                </Constraint>
-              </Constraints>
-
-              <Layout class="org.netbeans.modules.form.compat2.layouts.DesignBorderLayout"/>
-            </Container>
-          </SubComponents>
-        </Container>
-      </SubComponents>
-    </Container>
-  </SubComponents>
-</Form>
diff --git a/Core/src/org/sleuthkit/autopsy/timeline/TimelineFrame.java b/Core/src/org/sleuthkit/autopsy/timeline/TimelineFrame.java
deleted file mode 100644
index 76256770d498a12a59e6220744337e3b3e50ef78..0000000000000000000000000000000000000000
--- a/Core/src/org/sleuthkit/autopsy/timeline/TimelineFrame.java
+++ /dev/null
@@ -1,169 +0,0 @@
-/*
- * Autopsy Forensic Browser
- *
- * Copyright 2013 Basis Technology Corp.
- * Contact: carrier <at> sleuthkit <dot> org
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.sleuthkit.autopsy.timeline;
-
-import java.awt.BorderLayout;
-import java.awt.Component;
-import java.awt.Cursor;
-import java.awt.Dimension;
-import java.awt.Image;
-
-/**
- *
- * Ready timeline frame with layout to hold dynamic components
- */
- class TimelineFrame extends javax.swing.JFrame {
-
-    /**
-     * Creates new form TimelineFrame
-     */
-    public TimelineFrame() {
-        initComponents();
-    }
-
-    /**
-     * This method is called from within the constructor to initialize the form.
-     * WARNING: Do NOT modify this code. The content of this method is always
-     * regenerated by the Form Editor.
-     */
-    @SuppressWarnings("unchecked")
-    // <editor-fold defaultstate="collapsed" desc="Generated Code">//GEN-BEGIN:initComponents
-    private void initComponents() {
-
-        splitYPane = new javax.swing.JSplitPane();
-        topPane = new javax.swing.JPanel();
-        splitXPane = new javax.swing.JSplitPane();
-        leftPane = new javax.swing.JPanel();
-        rightPane = new javax.swing.JPanel();
-
-        setDefaultCloseOperation(javax.swing.WindowConstants.DISPOSE_ON_CLOSE);
-        setTitle(org.openide.util.NbBundle.getMessage(TimelineFrame.class, "TimelineFrame.title")); // NOI18N
-        setPreferredSize(new java.awt.Dimension(1200, 700));
-
-        splitYPane.setDividerLocation(420);
-        splitYPane.setOrientation(javax.swing.JSplitPane.VERTICAL_SPLIT);
-        splitYPane.setResizeWeight(0.5);
-        splitYPane.setPreferredSize(new java.awt.Dimension(1024, 400));
-
-        topPane.setPreferredSize(new java.awt.Dimension(1200, 400));
-        topPane.setLayout(new java.awt.BorderLayout());
-        splitYPane.setLeftComponent(topPane);
-
-        splitXPane.setDividerLocation(600);
-        splitXPane.setResizeWeight(0.5);
-        splitXPane.setPreferredSize(new java.awt.Dimension(1200, 300));
-        splitXPane.setRequestFocusEnabled(false);
-
-        leftPane.setPreferredSize(new java.awt.Dimension(700, 300));
-        leftPane.setLayout(new java.awt.BorderLayout());
-        splitXPane.setLeftComponent(leftPane);
-
-        rightPane.setPreferredSize(new java.awt.Dimension(500, 300));
-        rightPane.setLayout(new java.awt.BorderLayout());
-        splitXPane.setRightComponent(rightPane);
-
-        splitYPane.setRightComponent(splitXPane);
-
-        javax.swing.GroupLayout layout = new javax.swing.GroupLayout(getContentPane());
-        getContentPane().setLayout(layout);
-        layout.setHorizontalGroup(
-            layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
-            .addComponent(splitYPane, javax.swing.GroupLayout.Alignment.TRAILING, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE)
-        );
-        layout.setVerticalGroup(
-            layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
-            .addComponent(splitYPane, javax.swing.GroupLayout.Alignment.TRAILING, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE)
-        );
-
-        pack();
-    }// </editor-fold>//GEN-END:initComponents
-
-    void setTopPanel(Component component) {
-        this.topPane.add(component, BorderLayout.CENTER);
-    }
-    
-    void setBottomLeftPanel(Component component) {
-        this.leftPane.add(component, BorderLayout.CENTER);
-    }
-    
-    
-    void setBottomRightPanel(Component component) {
-        this.rightPane.add(component, BorderLayout.CENTER);
-    }
-    
-    void setFrameName(String name) {
-        this.setTitle(name);
-    }
-    
-    void setFrameIcon(Image iconImage) {
-        this.setIconImage(iconImage);
-    }
-    
-    void setFrameSize(Dimension size) {
-        this.setSize(size);
-    }
-    
-    void setTopComponentCursor(Cursor cursor) {
-        this.topPane.setCursor(cursor);
-    }
-    
-    
-    /**
-     * @param args the command line arguments
-     */
-    public static void main(String args[]) {
-        /* Set the Nimbus look and feel */
-        //<editor-fold defaultstate="collapsed" desc=" Look and feel setting code (optional) ">
-        /* If Nimbus (introduced in Java SE 6) is not available, stay with the default look and feel.
-         * For details see http://download.oracle.com/javase/tutorial/uiswing/lookandfeel/plaf.html 
-         */
-        try {
-            for (javax.swing.UIManager.LookAndFeelInfo info : javax.swing.UIManager.getInstalledLookAndFeels()) {
-                if ("Nimbus".equals(info.getName())) { //NON-NLS
-                    javax.swing.UIManager.setLookAndFeel(info.getClassName());
-                    break;
-                }
-            }
-        } catch (ClassNotFoundException ex) {
-            java.util.logging.Logger.getLogger(TimelineFrame.class.getName()).log(java.util.logging.Level.SEVERE, null, ex);
-        } catch (InstantiationException ex) {
-            java.util.logging.Logger.getLogger(TimelineFrame.class.getName()).log(java.util.logging.Level.SEVERE, null, ex);
-        } catch (IllegalAccessException ex) {
-            java.util.logging.Logger.getLogger(TimelineFrame.class.getName()).log(java.util.logging.Level.SEVERE, null, ex);
-        } catch (javax.swing.UnsupportedLookAndFeelException ex) {
-            java.util.logging.Logger.getLogger(TimelineFrame.class.getName()).log(java.util.logging.Level.SEVERE, null, ex);
-        }
-        //</editor-fold>
-
-        /* Create and display the form */
-        java.awt.EventQueue.invokeLater(new Runnable() {
-            public void run() {
-                new TimelineFrame().setVisible(true);
-            }
-        });
-    }
-    // Variables declaration - do not modify//GEN-BEGIN:variables
-    private javax.swing.JPanel leftPane;
-    private javax.swing.JPanel rightPane;
-    private javax.swing.JSplitPane splitXPane;
-    private javax.swing.JSplitPane splitYPane;
-    private javax.swing.JPanel topPane;
-    // End of variables declaration//GEN-END:variables
-}
diff --git a/Core/src/org/sleuthkit/autopsy/timeline/TimelineProgressDialog.form b/Core/src/org/sleuthkit/autopsy/timeline/TimelineProgressDialog.form
deleted file mode 100644
index 0a8a131d097019f41d3cd82e78a62ba822fbeebe..0000000000000000000000000000000000000000
--- a/Core/src/org/sleuthkit/autopsy/timeline/TimelineProgressDialog.form
+++ /dev/null
@@ -1,62 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-
-<Form version="1.5" maxVersion="1.8" type="org.netbeans.modules.form.forminfo.JDialogFormInfo">
-  <SyntheticProperties>
-    <SyntheticProperty name="formSizePolicy" type="int" value="1"/>
-    <SyntheticProperty name="generateCenter" type="boolean" value="false"/>
-  </SyntheticProperties>
-  <Events>
-    <EventHandler event="windowClosing" listener="java.awt.event.WindowListener" parameters="java.awt.event.WindowEvent" handler="closeDialog"/>
-  </Events>
-  <AuxValues>
-    <AuxValue name="FormSettings_autoResourcing" type="java.lang.Integer" value="1"/>
-    <AuxValue name="FormSettings_autoSetComponentName" type="java.lang.Boolean" value="false"/>
-    <AuxValue name="FormSettings_generateFQN" type="java.lang.Boolean" value="true"/>
-    <AuxValue name="FormSettings_generateMnemonicsCode" type="java.lang.Boolean" value="true"/>
-    <AuxValue name="FormSettings_i18nAutoMode" type="java.lang.Boolean" value="true"/>
-    <AuxValue name="FormSettings_layoutCodeTarget" type="java.lang.Integer" value="1"/>
-    <AuxValue name="FormSettings_listenerGenerationStyle" type="java.lang.Integer" value="0"/>
-    <AuxValue name="FormSettings_variablesLocal" type="java.lang.Boolean" value="false"/>
-    <AuxValue name="FormSettings_variablesModifier" type="java.lang.Integer" value="2"/>
-  </AuxValues>
-
-  <Layout>
-    <DimensionLayout dim="0">
-      <Group type="103" groupAlignment="0" attributes="0">
-          <Group type="102" attributes="0">
-              <EmptySpace max="-2" attributes="0"/>
-              <Group type="103" groupAlignment="0" attributes="0">
-                  <Component id="progressBar" pref="504" max="32767" attributes="0"/>
-                  <Group type="102" alignment="0" attributes="0">
-                      <Component id="jLabel1" min="-2" max="-2" attributes="0"/>
-                      <EmptySpace min="0" pref="0" max="32767" attributes="0"/>
-                  </Group>
-              </Group>
-              <EmptySpace max="-2" attributes="0"/>
-          </Group>
-      </Group>
-    </DimensionLayout>
-    <DimensionLayout dim="1">
-      <Group type="103" groupAlignment="0" attributes="0">
-          <Group type="102" alignment="0" attributes="0">
-              <EmptySpace max="-2" attributes="0"/>
-              <Component id="jLabel1" min="-2" max="-2" attributes="0"/>
-              <EmptySpace min="-2" pref="7" max="-2" attributes="0"/>
-              <Component id="progressBar" min="-2" max="-2" attributes="0"/>
-              <EmptySpace pref="16" max="32767" attributes="0"/>
-          </Group>
-      </Group>
-    </DimensionLayout>
-  </Layout>
-  <SubComponents>
-    <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/timeline/Bundle.properties" key="TimelineProgressDialog.jLabel1.text" replaceFormat="org.openide.util.NbBundle.getMessage({sourceFileName}.class, &quot;{key}&quot;)"/>
-        </Property>
-      </Properties>
-    </Component>
-    <Component class="javax.swing.JProgressBar" name="progressBar">
-    </Component>
-  </SubComponents>
-</Form>
diff --git a/Core/src/org/sleuthkit/autopsy/timeline/TimelineProgressDialog.java b/Core/src/org/sleuthkit/autopsy/timeline/TimelineProgressDialog.java
deleted file mode 100644
index 3b4844d415c54872c5712b260bf1491607847df8..0000000000000000000000000000000000000000
--- a/Core/src/org/sleuthkit/autopsy/timeline/TimelineProgressDialog.java
+++ /dev/null
@@ -1,184 +0,0 @@
-/*
- * Autopsy Forensic Browser
- *
- * Copyright 2013 Basis Technology Corp.
- * Contact: carrier <at> sleuthkit <dot> org
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.sleuthkit.autopsy.timeline;
-
-import java.awt.EventQueue;
-import java.awt.event.ActionEvent;
-import java.awt.event.KeyEvent;
-import javax.swing.AbstractAction;
-import javax.swing.ActionMap;
-import javax.swing.InputMap;
-import javax.swing.JComponent;
-import javax.swing.KeyStroke;
-
-import org.openide.util.NbBundle;
-import org.openide.windows.WindowManager;
-
-/**
- * Dialog with progress bar that pops up when timeline is being generated
- */
- class TimelineProgressDialog extends javax.swing.JDialog {
-
-    /**
-     * A return status code - returned if Cancel button has been pressed
-     */
-    public static final int RET_CANCEL = 0;
-    /**
-     * A return status code - returned if OK button has been pressed
-     */
-    public static final int RET_OK = 1;
-
-    /**
-     * Creates new form TimelineProgressDialog
-     */
-    public TimelineProgressDialog(java.awt.Frame parent, boolean modal) {
-        super(parent, modal);
-        initComponents();
-
-        setLocationRelativeTo(null);
-        //set icon the same as main app
-        setIconImage(WindowManager.getDefault().getMainWindow().getIconImage());
-
-        //progressBar.setIndeterminate(true);
-
-        setName(NbBundle.getMessage(this.getClass(), "TimelineProgressDialog.setName.text"));
-
-        // Close the dialog when Esc is pressed
-        String cancelName = "cancel"; //NON-NLS
-        InputMap inputMap = getRootPane().getInputMap(JComponent.WHEN_ANCESTOR_OF_FOCUSED_COMPONENT);
-        inputMap.put(KeyStroke.getKeyStroke(KeyEvent.VK_ESCAPE, 0), cancelName);
-        ActionMap actionMap = getRootPane().getActionMap();
-        actionMap.put(cancelName, new AbstractAction() {
-            public void actionPerformed(ActionEvent e) {
-                doClose(RET_CANCEL);
-            }
-        });
-    }
-
-    /**
-     * @return the return status of this dialog - one of RET_OK or RET_CANCEL
-     */
-    public int getReturnStatus() {
-        return returnStatus;
-    }
-
-    void updateProgressBar(final int progress) {
-        EventQueue.invokeLater(new Runnable() {
-            @Override
-            public void run() {
-                progressBar.setValue(progress);
-            }
-        });
-
-    }
-
-    void updateProgressBar(final String message) {
-        EventQueue.invokeLater(new Runnable() {
-            @Override
-            public void run() {
-                progressBar.setString(message);
-            }
-        });
-
-    }
-
-    void setProgressTotal(final int total) {
-        EventQueue.invokeLater(new Runnable() {
-            @Override
-            public void run() {
-                //progressBar.setIndeterminate(false);
-                progressBar.setMaximum(total);
-                //progressBar.setValue(0);
-                progressBar.setStringPainted(true);
-                progressBar.setVisible(true);
-            }
-        });
-
-    }
-
-    /**
-     * This method is called from within the constructor to initialize the form.
-     * WARNING: Do NOT modify this code. The content of this method is always
-     * regenerated by the Form Editor.
-     */
-    @SuppressWarnings("unchecked")
-    // <editor-fold defaultstate="collapsed" desc="Generated Code">//GEN-BEGIN:initComponents
-    private void initComponents() {
-
-        jLabel1 = new javax.swing.JLabel();
-        progressBar = new javax.swing.JProgressBar();
-
-        addWindowListener(new java.awt.event.WindowAdapter() {
-            public void windowClosing(java.awt.event.WindowEvent evt) {
-                closeDialog(evt);
-            }
-        });
-
-        org.openide.awt.Mnemonics.setLocalizedText(jLabel1, org.openide.util.NbBundle.getMessage(TimelineProgressDialog.class, "TimelineProgressDialog.jLabel1.text")); // NOI18N
-
-        javax.swing.GroupLayout layout = new javax.swing.GroupLayout(getContentPane());
-        getContentPane().setLayout(layout);
-        layout.setHorizontalGroup(
-            layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
-            .addGroup(layout.createSequentialGroup()
-                .addContainerGap()
-                .addGroup(layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
-                    .addComponent(progressBar, javax.swing.GroupLayout.DEFAULT_SIZE, 504, Short.MAX_VALUE)
-                    .addGroup(layout.createSequentialGroup()
-                        .addComponent(jLabel1)
-                        .addGap(0, 0, Short.MAX_VALUE)))
-                .addContainerGap())
-        );
-        layout.setVerticalGroup(
-            layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
-            .addGroup(layout.createSequentialGroup()
-                .addContainerGap()
-                .addComponent(jLabel1)
-                .addGap(7, 7, 7)
-                .addComponent(progressBar, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE)
-                .addContainerGap(16, Short.MAX_VALUE))
-        );
-
-        pack();
-    }// </editor-fold>//GEN-END:initComponents
-
-    /**
-     * Closes the dialog
-     */
-    private void closeDialog(java.awt.event.WindowEvent evt) {//GEN-FIRST:event_closeDialog
-        doClose(RET_CANCEL);
-    }//GEN-LAST:event_closeDialog
-
-    void doClose(final int retStatus) {
-        EventQueue.invokeLater(new Runnable() {
-            @Override
-            public void run() {
-                returnStatus = retStatus;
-                setVisible(false);
-                dispose();
-            }
-        });
-
-    }
-    // Variables declaration - do not modify//GEN-BEGIN:variables
-    private javax.swing.JLabel jLabel1;
-    private javax.swing.JProgressBar progressBar;
-    // End of variables declaration//GEN-END:variables
-    private int returnStatus = RET_CANCEL;
-}
diff --git a/Core/src/org/sleuthkit/autopsy/timeline/layer.xml b/Core/src/org/sleuthkit/autopsy/timeline/layer.xml
deleted file mode 100644
index 1a06f5740a7e08b991ea4abc0b91a64af5ec7319..0000000000000000000000000000000000000000
--- a/Core/src/org/sleuthkit/autopsy/timeline/layer.xml
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE filesystem PUBLIC "-//NetBeans//DTD Filesystem 1.2//EN" "http://www.netbeans.org/dtds/filesystem-1_2.dtd">
-<filesystem>
-
- 
-    <!-- ======================================================
-    Windows2
-    ====================================================== -->
-    <folder name="Actions">
-        <folder name="Tools">
-            <file name="org-sleuthkit-autopsy-timeline-Simile2.instance_hidden"/>
-            <file name="org-sleuthkit-autopsy-timeline-Timeline.instance"/>
-        </folder>
-        <folder name="Window">
-            <file name="org-sleuthkit-autopsy-timeline-Timeline2TopComponent.instance_hidden"/>
-            <file name="org-sleuthkit-autopsy-timeline-TimelineTopComponent.instance_hidden"/>
-        </folder>
-    </folder>
-    <folder name="Windows2">
-        <folder name="Components">
-          
-        </folder>
-        <folder name="Modes">
-            <file name="timeline.wsmode" url="timelineWsmode.xml"/>
-        </folder>
-    </folder>
-    
-</filesystem>
diff --git a/Core/src/org/sleuthkit/autopsy/timeline/timelineWsmode.xml b/Core/src/org/sleuthkit/autopsy/timeline/timelineWsmode.xml
deleted file mode 100644
index cde9642f4a3f62393862eda5fc569fa88eb0ae0f..0000000000000000000000000000000000000000
--- a/Core/src/org/sleuthkit/autopsy/timeline/timelineWsmode.xml
+++ /dev/null
@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE mode PUBLIC
-          "-//NetBeans//DTD Mode Properties 2.0//EN"
-          "http://www.netbeans.org/dtds/mode-properties2_0.dtd">
-
-<mode version="2.3">
-    <name unique="timeline" />
-    <!--<kind type="view" /> --> <!-- modal -->
-    <kind type="editor" />  <!-- non-modal -->
-  <state type="separated" />
-   <constraints>
-    <path orientation="horizontal" number="100" weight="0.5"/>
-  </constraints>
-  <bounds x="7" y="909" width="400" height="250" />
-  <frame state="0"/>
-    <empty-behavior permanent="true"/>
-</mode>
\ No newline at end of file
diff --git a/Timeline/build.xml b/Timeline/build.xml
index 30bd2c36cf4de0d97c4fe8c15f5b5de725716be4..b99c79655da4a275300f09e759b499e420aa6cd4 100644
--- a/Timeline/build.xml
+++ b/Timeline/build.xml
@@ -2,8 +2,8 @@
 <!-- You may freely edit this file. See harness/README in the NetBeans platform -->
 <!-- for some information on what you could do (e.g. targets to override). -->
 <!-- If you delete this file and reopen the project it will be recreated. -->
-<project name="org.sleuthkit.autopsy.advancedtimeline" default="netbeans" basedir=".">
-    <description>Builds, tests, and runs the project org.sleuthkit.autopsy.advancedtimeline.</description>
+<project name="org.sleuthkit.autopsy.timeline" default="netbeans" basedir=".">
+    <description>Builds, tests, and runs the project org.sleuthkit.autopsy.timeline.</description>
     <import file="nbproject/build-impl.xml"/>
    
 </project>
diff --git a/Timeline/manifest.mf b/Timeline/manifest.mf
index 511879af34e90a0afcc93ca071f28d6fd295e1bb..89925c271ec5176a7bda9cd4a0c0438a7eccc317 100644
--- a/Timeline/manifest.mf
+++ b/Timeline/manifest.mf
@@ -1,6 +1,6 @@
 Manifest-Version: 1.0
-OpenIDE-Module: org.sleuthkit.autopsy.advancedtimeline
-OpenIDE-Module-Localizing-Bundle: org/sleuthkit/autopsy/advancedtimeline/Bundle.properties
+OpenIDE-Module: org.sleuthkit.autopsy.timeline
+OpenIDE-Module-Localizing-Bundle: org/sleuthkit/autopsy/timeline/Bundle.properties
 OpenIDE-Module-Requires: org.openide.windows.WindowManager
 OpenIDE-Module-Specification-Version: 1.0
 
diff --git a/Timeline/nbproject/build-impl.xml b/Timeline/nbproject/build-impl.xml
index 21ab232c31432875db4c434caff4ba53825c3136..4babba24f71fcaac06c8eb32def4c87a1ebe5956 100644
--- a/Timeline/nbproject/build-impl.xml
+++ b/Timeline/nbproject/build-impl.xml
@@ -3,7 +3,7 @@
 *** GENERATED FROM project.xml - DO NOT EDIT  ***
 ***         EDIT ../build.xml INSTEAD         ***
 -->
-<project name="org.sleuthkit.autopsy.advancedtimeline-impl" basedir="..">
+<project name="org.sleuthkit.autopsy.timeline-impl" basedir="..">
     <fail message="Please build using Ant 1.7.1 or higher.">
         <condition>
             <not>
diff --git a/Timeline/nbproject/project.xml b/Timeline/nbproject/project.xml
index ab93b346d2cb4543083e3579075a1647ba74a6c8..e7df2f5673d64306022504c0c4f94920e215d242 100644
--- a/Timeline/nbproject/project.xml
+++ b/Timeline/nbproject/project.xml
@@ -3,7 +3,7 @@
     <type>org.netbeans.modules.apisupport.project</type>
     <configuration>
         <data xmlns="http://www.netbeans.org/ns/nb-module-project/3">
-            <code-name-base>org.sleuthkit.autopsy.advancedtimeline</code-name-base>
+            <code-name-base>org.sleuthkit.autopsy.timeline</code-name-base>
             <suite-component/>
             <module-dependencies>
                 <dependency>
diff --git a/Timeline/src/org/sleuthkit/autopsy/advancedtimeline/Bundle.properties b/Timeline/src/org/sleuthkit/autopsy/advancedtimeline/Bundle.properties
deleted file mode 100644
index 051c23fc9428107ad5922cd9e5246c151b396b74..0000000000000000000000000000000000000000
--- a/Timeline/src/org/sleuthkit/autopsy/advancedtimeline/Bundle.properties
+++ /dev/null
@@ -1,38 +0,0 @@
-OpenIDE-Module-Name=Timeline
-CTL_MakeAdvTimeline="Advanced Timeline"
-AdvTimeline.frameName.text={0} - Autopsy Advanced Timeline
-AdvTimeline.resultsPanel.title=Advanced Timeline Results
-AdvTimeline.getName=Advanced Timeline
-AdvTimeline.runJavaFxThread.progress.creating=Creating advanced timeline . . .
-AdvTimeline.zoomOutButton.text=Zoom Out
-AdvTimeline.goToButton.text=Go To\:
-AdvTimeline.yearBarChart.x.years=Years
-AdvTimeline.yearBarChart.y.numEvents=Number of Events
-AdvTimeline.MonthsBarChart.x.monthYY=Month ({0})
-AdvTimeline.MonthsBarChart.y.numEvents=Number of Events
-AdvTimeline.eventsByMoBarChart.x.dayOfMo=Day of Month
-AdvTimeline.eventsByMoBarChart.y.numEvents=Number of Events
-AdvTimeline.node.emptyRoot=Empty Root
-AdvTimeline.resultPanel.loading=Loading...
-AdvTimeline.node.root=Root
-AdvTimeline.propChg.confDlg.timelineOOD.msg=The event data is out of date. Would you like to regenerate it?
-AdvTimeline.propChg.confDlg.timelineOOD.details=Select an option
-AdvTimeline.initTimeline.confDlg.genBeforeIngest.msg=You are trying to generate a timeline before ingest has been completed. The timeline may be incomplete. Do you want to continue?
-AdvTimeline.initTimeline.confDlg.genBeforeIngest.details=Advanced Timeline
-TimelineFrame.title=Advanced Timeline
-TimelinePanel.jButton1.text=6m
-TimelinePanel.jButton13.text=all
-TimelinePanel.jButton10.text=1h
-TimelinePanel.jButton9.text=12h
-TimelinePanel.jButton11.text=5y
-TimelinePanel.jButton12.text=10y
-TimelinePanel.jButton6.text=1w
-TimelinePanel.jButton5.text=1y
-TimelinePanel.jButton8.text=1d
-TimelinePanel.jButton7.text=3d
-TimelinePanel.jButton2.text=1m
-TimelinePanel.jButton3.text=3m
-TimelinePanel.jButton4.text=2w
-ProgressWindow.progressHeader.text=\ 
-AggregateEvent.differentTypes="aggregate events are not compatible they ahave different types"
-AggregateEvent.differentDescriptions="aggregate events are not compatible they ahave different descriptions"
diff --git a/Timeline/src/org/sleuthkit/autopsy/timeline/Bundle.properties b/Timeline/src/org/sleuthkit/autopsy/timeline/Bundle.properties
new file mode 100644
index 0000000000000000000000000000000000000000..a2a287e3220501c96467e63b8803cacb164f7b9a
--- /dev/null
+++ b/Timeline/src/org/sleuthkit/autopsy/timeline/Bundle.properties
@@ -0,0 +1,37 @@
+OpenIDE-Module-Name=Timeline
+CTL_MakeTimeline="Timeline"
+Timeline.frameName.text={0} - Autopsy Timeline
+Timeline.resultsPanel.title=Timeline Results
+Timeline.runJavaFxThread.progress.creating=Creating timeline . . .
+Timeline.zoomOutButton.text=Zoom Out
+Timeline.goToButton.text=Go To\:
+Timeline.yearBarChart.x.years=Years
+Timeline.yearBarChart.y.numEvents=Number of Events
+Timeline.MonthsBarChart.x.monthYY=Month ({0})
+Timeline.MonthsBarChart.y.numEvents=Number of Events
+Timeline.eventsByMoBarChart.x.dayOfMo=Day of Month
+Timeline.eventsByMoBarChart.y.numEvents=Number of Events
+Timeline.node.emptyRoot=Empty Root
+Timeline.resultPanel.loading=Loading...
+Timeline.node.root=Root
+Timeline.propChg.confDlg.timelineOOD.msg=The event data is out of date. Would you like to regenerate it?
+Timeline.propChg.confDlg.timelineOOD.details=Select an option
+Timeline.initTimeline.confDlg.genBeforeIngest.msg=You are trying to generate a timeline before ingest has been completed. The timeline may be incomplete. Do you want to continue?
+Timeline.initTimeline.confDlg.genBeforeIngest.details=Timeline
+TimelineFrame.title=Timeline
+TimelinePanel.jButton1.text=6m
+TimelinePanel.jButton13.text=all
+TimelinePanel.jButton10.text=1h
+TimelinePanel.jButton9.text=12h
+TimelinePanel.jButton11.text=5y
+TimelinePanel.jButton12.text=10y
+TimelinePanel.jButton6.text=1w
+TimelinePanel.jButton5.text=1y
+TimelinePanel.jButton8.text=1d
+TimelinePanel.jButton7.text=3d
+TimelinePanel.jButton2.text=1m
+TimelinePanel.jButton3.text=3m
+TimelinePanel.jButton4.text=2w
+ProgressWindow.progressHeader.text=\ 
+AggregateEvent.differentTypes="aggregate events are not compatible they have different types"
+AggregateEvent.differentDescriptions="aggregate events are not compatible they have different descriptions"
diff --git a/Timeline/src/org/sleuthkit/autopsy/advancedtimeline/FXMLConstructor.java b/Timeline/src/org/sleuthkit/autopsy/timeline/FXMLConstructor.java
similarity index 99%
rename from Timeline/src/org/sleuthkit/autopsy/advancedtimeline/FXMLConstructor.java
rename to Timeline/src/org/sleuthkit/autopsy/timeline/FXMLConstructor.java
index 6fae6b169024d5599ad7db3e28cb9f034feb41ea..685d50d3d56b8231946f85f3a4fbb7feb226c97f 100644
--- a/Timeline/src/org/sleuthkit/autopsy/advancedtimeline/FXMLConstructor.java
+++ b/Timeline/src/org/sleuthkit/autopsy/timeline/FXMLConstructor.java
@@ -16,7 +16,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.sleuthkit.autopsy.advancedtimeline;
+package org.sleuthkit.autopsy.timeline;
 
 import java.io.IOException;
 import java.net.URL;
@@ -70,6 +70,7 @@ static public void construct(Node n, String fxmlFileName) {
     static public class CachingClassLoader extends ClassLoader {
 
         private final Map<String, Class<?>> classes = new HashMap<>();
+
         private final ClassLoader parent;
 
         public CachingClassLoader(ClassLoader parent) {
diff --git a/Timeline/src/org/sleuthkit/autopsy/advancedtimeline/LoggedTask.java b/Timeline/src/org/sleuthkit/autopsy/timeline/LoggedTask.java
similarity index 97%
rename from Timeline/src/org/sleuthkit/autopsy/advancedtimeline/LoggedTask.java
rename to Timeline/src/org/sleuthkit/autopsy/timeline/LoggedTask.java
index e9260eeabdfb9950501eba81b17b58bb31f10d2b..5a0a55ba4f03eaa8d935b485c674d1c4eeef69b5 100644
--- a/Timeline/src/org/sleuthkit/autopsy/advancedtimeline/LoggedTask.java
+++ b/Timeline/src/org/sleuthkit/autopsy/timeline/LoggedTask.java
@@ -16,7 +16,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.sleuthkit.autopsy.advancedtimeline;
+package org.sleuthkit.autopsy.timeline;
 
 import java.util.concurrent.ExecutionException;
 import java.util.logging.Level;
diff --git a/Timeline/src/org/sleuthkit/autopsy/advancedtimeline/OpenTimelineAction.java b/Timeline/src/org/sleuthkit/autopsy/timeline/OpenTimelineAction.java
similarity index 90%
rename from Timeline/src/org/sleuthkit/autopsy/advancedtimeline/OpenTimelineAction.java
rename to Timeline/src/org/sleuthkit/autopsy/timeline/OpenTimelineAction.java
index 179d176d71d1fd8c439c161a78b4645caf68ed23..fd1f450370a1f2064d0d8734c12bc62b5b270abd 100644
--- a/Timeline/src/org/sleuthkit/autopsy/advancedtimeline/OpenTimelineAction.java
+++ b/Timeline/src/org/sleuthkit/autopsy/timeline/OpenTimelineAction.java
@@ -16,7 +16,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.sleuthkit.autopsy.advancedtimeline;
+package org.sleuthkit.autopsy.timeline;
 
 import java.util.logging.Level;
 import javax.swing.JOptionPane;
@@ -25,15 +25,14 @@
 import org.openide.awt.ActionReferences;
 import org.openide.awt.ActionRegistration;
 import org.openide.util.HelpCtx;
-import org.openide.util.NbBundle;
 import org.openide.util.actions.CallableSystemAction;
 import org.openide.windows.WindowManager;
 import org.sleuthkit.autopsy.casemodule.Case;
 import org.sleuthkit.autopsy.core.Installer;
 import org.sleuthkit.autopsy.coreutils.Logger;
 
-@ActionID(category = "Tools", id = "org.sleuthkit.autopsy.advancedtimeline.AdvTimeline")
-@ActionRegistration(displayName = "#CTL_MakeAdvTimeline", lazy = false)
+@ActionID(category = "Tools", id = "org.sleuthkit.autopsy.timeline.Timeline")
+@ActionRegistration(displayName = "#CTL_MakeTimeline", lazy = false)
 @ActionReferences(value = {
     @ActionReference(path = "Menu/Tools", position = 100)})
 public class OpenTimelineAction extends CallableSystemAction {
@@ -82,7 +81,7 @@ public void performAction() {
 
     @Override
     public String getName() {
-        return NbBundle.getMessage(this.getClass(), "AdvTimeline.getName");
+        return "Timeline";
     }
 
     @Override
diff --git a/Timeline/src/org/sleuthkit/autopsy/advancedtimeline/ProgressWindow.form b/Timeline/src/org/sleuthkit/autopsy/timeline/ProgressWindow.form
similarity index 100%
rename from Timeline/src/org/sleuthkit/autopsy/advancedtimeline/ProgressWindow.form
rename to Timeline/src/org/sleuthkit/autopsy/timeline/ProgressWindow.form
diff --git a/Timeline/src/org/sleuthkit/autopsy/advancedtimeline/ProgressWindow.java b/Timeline/src/org/sleuthkit/autopsy/timeline/ProgressWindow.java
similarity index 99%
rename from Timeline/src/org/sleuthkit/autopsy/advancedtimeline/ProgressWindow.java
rename to Timeline/src/org/sleuthkit/autopsy/timeline/ProgressWindow.java
index 9560d66f68527bd537e69812f4e2d774b89dd063..3fb9624f2a5c88d31d900e98d68484c54402af3a 100644
--- a/Timeline/src/org/sleuthkit/autopsy/advancedtimeline/ProgressWindow.java
+++ b/Timeline/src/org/sleuthkit/autopsy/timeline/ProgressWindow.java
@@ -16,7 +16,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.sleuthkit.autopsy.advancedtimeline;
+package org.sleuthkit.autopsy.timeline;
 
 import java.awt.Component;
 import java.awt.event.ActionEvent;
diff --git a/Timeline/src/org/sleuthkit/autopsy/advancedtimeline/TimeLineController.java b/Timeline/src/org/sleuthkit/autopsy/timeline/TimeLineController.java
similarity index 97%
rename from Timeline/src/org/sleuthkit/autopsy/advancedtimeline/TimeLineController.java
rename to Timeline/src/org/sleuthkit/autopsy/timeline/TimeLineController.java
index 02f3df842f626140a4b4345ba3c3fb634df62b86..97426a5f4e350baf883195e52c328b95cac255df 100644
--- a/Timeline/src/org/sleuthkit/autopsy/advancedtimeline/TimeLineController.java
+++ b/Timeline/src/org/sleuthkit/autopsy/timeline/TimeLineController.java
@@ -16,7 +16,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.sleuthkit.autopsy.advancedtimeline;
+package org.sleuthkit.autopsy.timeline;
 
 import java.awt.HeadlessException;
 import java.beans.PropertyChangeEvent;
@@ -59,16 +59,16 @@
 import org.openide.util.Exceptions;
 import org.openide.util.NbBundle;
 import org.openide.windows.WindowManager;
-import org.sleuthkit.autopsy.advancedtimeline.events.FilteredEventsModel;
-import org.sleuthkit.autopsy.advancedtimeline.events.db.EventsRepository;
-import org.sleuthkit.autopsy.advancedtimeline.events.type.EventType;
-import org.sleuthkit.autopsy.advancedtimeline.filters.Filter;
-import org.sleuthkit.autopsy.advancedtimeline.filters.TypeFilter;
-import org.sleuthkit.autopsy.advancedtimeline.utils.IntervalUtils;
-import org.sleuthkit.autopsy.advancedtimeline.utils.ObservableStack;
-import org.sleuthkit.autopsy.advancedtimeline.zooming.DescriptionLOD;
-import org.sleuthkit.autopsy.advancedtimeline.zooming.EventTypeZoomLevel;
-import org.sleuthkit.autopsy.advancedtimeline.zooming.ZoomParams;
+import org.sleuthkit.autopsy.timeline.events.FilteredEventsModel;
+import org.sleuthkit.autopsy.timeline.events.db.EventsRepository;
+import org.sleuthkit.autopsy.timeline.events.type.EventType;
+import org.sleuthkit.autopsy.timeline.filters.Filter;
+import org.sleuthkit.autopsy.timeline.filters.TypeFilter;
+import org.sleuthkit.autopsy.timeline.utils.IntervalUtils;
+import org.sleuthkit.autopsy.timeline.utils.ObservableStack;
+import org.sleuthkit.autopsy.timeline.zooming.DescriptionLOD;
+import org.sleuthkit.autopsy.timeline.zooming.EventTypeZoomLevel;
+import org.sleuthkit.autopsy.timeline.zooming.ZoomParams;
 import org.sleuthkit.autopsy.casemodule.Case;
 import static org.sleuthkit.autopsy.casemodule.Case.Events.CURRENT_CASE;
 import static org.sleuthkit.autopsy.casemodule.Case.Events.DATA_SOURCE_ADDED;
diff --git a/Timeline/src/org/sleuthkit/autopsy/advancedtimeline/TimeLineException.java b/Timeline/src/org/sleuthkit/autopsy/timeline/TimeLineException.java
similarity index 95%
rename from Timeline/src/org/sleuthkit/autopsy/advancedtimeline/TimeLineException.java
rename to Timeline/src/org/sleuthkit/autopsy/timeline/TimeLineException.java
index ce92212bfc69c6aed0f66ef76b7da14c39174729..82aa4df51f2908dc3f9b578d3da93db5d7f4d01d 100644
--- a/Timeline/src/org/sleuthkit/autopsy/advancedtimeline/TimeLineException.java
+++ b/Timeline/src/org/sleuthkit/autopsy/timeline/TimeLineException.java
@@ -16,7 +16,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.sleuthkit.autopsy.advancedtimeline;
+package org.sleuthkit.autopsy.timeline;
 
 /**
  *
diff --git a/Timeline/src/org/sleuthkit/autopsy/advancedtimeline/TimeLineTopComponent.form b/Timeline/src/org/sleuthkit/autopsy/timeline/TimeLineTopComponent.form
similarity index 100%
rename from Timeline/src/org/sleuthkit/autopsy/advancedtimeline/TimeLineTopComponent.form
rename to Timeline/src/org/sleuthkit/autopsy/timeline/TimeLineTopComponent.form
diff --git a/Timeline/src/org/sleuthkit/autopsy/advancedtimeline/TimeLineTopComponent.java b/Timeline/src/org/sleuthkit/autopsy/timeline/TimeLineTopComponent.java
similarity index 94%
rename from Timeline/src/org/sleuthkit/autopsy/advancedtimeline/TimeLineTopComponent.java
rename to Timeline/src/org/sleuthkit/autopsy/timeline/TimeLineTopComponent.java
index 62f552e3588b06186baee57a55a655077c36edcd..17a595e5802da83bbd92d4b6376b38c52499d6db 100644
--- a/Timeline/src/org/sleuthkit/autopsy/advancedtimeline/TimeLineTopComponent.java
+++ b/Timeline/src/org/sleuthkit/autopsy/timeline/TimeLineTopComponent.java
@@ -16,7 +16,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.sleuthkit.autopsy.advancedtimeline;
+package org.sleuthkit.autopsy.timeline;
 
 import java.awt.BorderLayout;
 import java.util.Collections;
@@ -42,15 +42,15 @@
 import org.openide.windows.TopComponent;
 import static org.openide.windows.TopComponent.PROP_UNDOCKING_DISABLED;
 import org.openide.windows.WindowManager;
-import org.sleuthkit.autopsy.advancedtimeline.actions.Back;
-import org.sleuthkit.autopsy.advancedtimeline.actions.Forward;
-import org.sleuthkit.autopsy.advancedtimeline.ui.StatusBar;
-import org.sleuthkit.autopsy.advancedtimeline.ui.TimeLineResultView;
-import org.sleuthkit.autopsy.advancedtimeline.ui.TimeZonePanel;
-import org.sleuthkit.autopsy.advancedtimeline.ui.VisualizationPanel;
-import org.sleuthkit.autopsy.advancedtimeline.ui.detailview.tree.NavPanel;
-import org.sleuthkit.autopsy.advancedtimeline.ui.filtering.FilterSetPanel;
-import org.sleuthkit.autopsy.advancedtimeline.zooming.ZoomSettingsPane;
+import org.sleuthkit.autopsy.timeline.actions.Back;
+import org.sleuthkit.autopsy.timeline.actions.Forward;
+import org.sleuthkit.autopsy.timeline.ui.StatusBar;
+import org.sleuthkit.autopsy.timeline.ui.TimeLineResultView;
+import org.sleuthkit.autopsy.timeline.ui.TimeZonePanel;
+import org.sleuthkit.autopsy.timeline.ui.VisualizationPanel;
+import org.sleuthkit.autopsy.timeline.ui.detailview.tree.NavPanel;
+import org.sleuthkit.autopsy.timeline.ui.filtering.FilterSetPanel;
+import org.sleuthkit.autopsy.timeline.zooming.ZoomSettingsPane;
 import org.sleuthkit.autopsy.corecomponents.DataContentPanel;
 import org.sleuthkit.autopsy.corecomponents.DataResultPanel;
 import org.sleuthkit.autopsy.coreutils.Logger;
@@ -59,7 +59,7 @@
  * TopComponent for the advanced timeline module.
  */
 @ConvertAsProperties(
-        dtd = "-//org.sleuthkit.autopsy.advancedtimeline//TimeLine//EN",
+        dtd = "-//org.sleuthkit.autopsy.timeline//TimeLine//EN",
         autostore = false)
 @TopComponent.Description(
         preferredID = "TimeLineTopComponent",
diff --git a/Timeline/src/org/sleuthkit/autopsy/advancedtimeline/TimeLineUI.java b/Timeline/src/org/sleuthkit/autopsy/timeline/TimeLineUI.java
similarity index 94%
rename from Timeline/src/org/sleuthkit/autopsy/advancedtimeline/TimeLineUI.java
rename to Timeline/src/org/sleuthkit/autopsy/timeline/TimeLineUI.java
index f45ef7ee87b271dcb216ad641073cbea8fe8754e..bb14f76aeee6a38639bb8891b4281202dcafcff8 100644
--- a/Timeline/src/org/sleuthkit/autopsy/advancedtimeline/TimeLineUI.java
+++ b/Timeline/src/org/sleuthkit/autopsy/timeline/TimeLineUI.java
@@ -16,7 +16,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.sleuthkit.autopsy.advancedtimeline;
+package org.sleuthkit.autopsy.timeline;
 
 /**
  *
diff --git a/Timeline/src/org/sleuthkit/autopsy/advancedtimeline/TimeLineView.java b/Timeline/src/org/sleuthkit/autopsy/timeline/TimeLineView.java
similarity index 89%
rename from Timeline/src/org/sleuthkit/autopsy/advancedtimeline/TimeLineView.java
rename to Timeline/src/org/sleuthkit/autopsy/timeline/TimeLineView.java
index ff208ca788eb33d565e380fd23468176cc15239e..a29058ac6fa17a9251ce94aef9577103d145c121 100644
--- a/Timeline/src/org/sleuthkit/autopsy/advancedtimeline/TimeLineView.java
+++ b/Timeline/src/org/sleuthkit/autopsy/timeline/TimeLineView.java
@@ -16,13 +16,13 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.sleuthkit.autopsy.advancedtimeline;
+package org.sleuthkit.autopsy.timeline;
 
 /** Interface to be implemented by views of the data.
  *
  * Most implementations should install the relevant listeners in their
  * {@link #setController} and {@link #setModel} methods */
-import org.sleuthkit.autopsy.advancedtimeline.events.FilteredEventsModel;
+import org.sleuthkit.autopsy.timeline.events.FilteredEventsModel;
 
 public interface TimeLineView extends TimeLineUI {
 
diff --git a/Timeline/src/org/sleuthkit/autopsy/advancedtimeline/VisualizationMode.java b/Timeline/src/org/sleuthkit/autopsy/timeline/VisualizationMode.java
similarity index 93%
rename from Timeline/src/org/sleuthkit/autopsy/advancedtimeline/VisualizationMode.java
rename to Timeline/src/org/sleuthkit/autopsy/timeline/VisualizationMode.java
index 4922fbd3ebab2b68ce5b7c9a4edd5aca2a4a6e15..8990b792bce6ac1ad39174bdfea97f37b19a8ecb 100644
--- a/Timeline/src/org/sleuthkit/autopsy/advancedtimeline/VisualizationMode.java
+++ b/Timeline/src/org/sleuthkit/autopsy/timeline/VisualizationMode.java
@@ -16,7 +16,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.sleuthkit.autopsy.advancedtimeline;
+package org.sleuthkit.autopsy.timeline;
 
 /**
  *
diff --git a/Timeline/src/org/sleuthkit/autopsy/advancedtimeline/actions/Back.java b/Timeline/src/org/sleuthkit/autopsy/timeline/actions/Back.java
similarity index 92%
rename from Timeline/src/org/sleuthkit/autopsy/advancedtimeline/actions/Back.java
rename to Timeline/src/org/sleuthkit/autopsy/timeline/actions/Back.java
index e5be1a58b71221ad85c198868f25beddd6077c55..1249b70f168f802ca249922ba68fb5737df38e67 100644
--- a/Timeline/src/org/sleuthkit/autopsy/advancedtimeline/actions/Back.java
+++ b/Timeline/src/org/sleuthkit/autopsy/timeline/actions/Back.java
@@ -16,7 +16,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.sleuthkit.autopsy.advancedtimeline.actions;
+package org.sleuthkit.autopsy.timeline.actions;
 
 import javafx.event.ActionEvent;
 import javafx.scene.image.Image;
@@ -24,7 +24,7 @@
 import javafx.scene.input.KeyCode;
 import javafx.scene.input.KeyCodeCombination;
 import org.controlsfx.control.action.AbstractAction;
-import org.sleuthkit.autopsy.advancedtimeline.TimeLineController;
+import org.sleuthkit.autopsy.timeline.TimeLineController;
 
 /**
  *
diff --git a/Timeline/src/org/sleuthkit/autopsy/advancedtimeline/actions/DefaultFilters.java b/Timeline/src/org/sleuthkit/autopsy/timeline/actions/DefaultFilters.java
similarity index 86%
rename from Timeline/src/org/sleuthkit/autopsy/advancedtimeline/actions/DefaultFilters.java
rename to Timeline/src/org/sleuthkit/autopsy/timeline/actions/DefaultFilters.java
index 84e2cc638da5c07bfbe033028f1519fba6c7301b..f9182bc90aee9e868001a2a4726f8c2157f4f4ba 100644
--- a/Timeline/src/org/sleuthkit/autopsy/advancedtimeline/actions/DefaultFilters.java
+++ b/Timeline/src/org/sleuthkit/autopsy/timeline/actions/DefaultFilters.java
@@ -16,14 +16,14 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.sleuthkit.autopsy.advancedtimeline.actions;
+package org.sleuthkit.autopsy.timeline.actions;
 
 import javafx.beans.binding.BooleanBinding;
 import javafx.event.ActionEvent;
 import org.controlsfx.control.action.AbstractAction;
-import org.sleuthkit.autopsy.advancedtimeline.TimeLineController;
-import org.sleuthkit.autopsy.advancedtimeline.events.FilteredEventsModel;
-import org.sleuthkit.autopsy.advancedtimeline.filters.Filter;
+import org.sleuthkit.autopsy.timeline.TimeLineController;
+import org.sleuthkit.autopsy.timeline.events.FilteredEventsModel;
+import org.sleuthkit.autopsy.timeline.filters.Filter;
 
 /**
  *
diff --git a/Timeline/src/org/sleuthkit/autopsy/advancedtimeline/actions/Forward.java b/Timeline/src/org/sleuthkit/autopsy/timeline/actions/Forward.java
similarity index 92%
rename from Timeline/src/org/sleuthkit/autopsy/advancedtimeline/actions/Forward.java
rename to Timeline/src/org/sleuthkit/autopsy/timeline/actions/Forward.java
index a65c77c286e87fbf1a5f412f5dda13e69ba48489..639a466852df82228bedbb672de2f0909694392a 100644
--- a/Timeline/src/org/sleuthkit/autopsy/advancedtimeline/actions/Forward.java
+++ b/Timeline/src/org/sleuthkit/autopsy/timeline/actions/Forward.java
@@ -16,7 +16,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.sleuthkit.autopsy.advancedtimeline.actions;
+package org.sleuthkit.autopsy.timeline.actions;
 
 import javafx.event.ActionEvent;
 import javafx.scene.image.Image;
@@ -24,7 +24,7 @@
 import javafx.scene.input.KeyCode;
 import javafx.scene.input.KeyCodeCombination;
 import org.controlsfx.control.action.AbstractAction;
-import org.sleuthkit.autopsy.advancedtimeline.TimeLineController;
+import org.sleuthkit.autopsy.timeline.TimeLineController;
 
 /**
  *
diff --git a/Timeline/src/org/sleuthkit/autopsy/advancedtimeline/actions/SaveSnapshot.java b/Timeline/src/org/sleuthkit/autopsy/timeline/actions/SaveSnapshot.java
similarity index 96%
rename from Timeline/src/org/sleuthkit/autopsy/advancedtimeline/actions/SaveSnapshot.java
rename to Timeline/src/org/sleuthkit/autopsy/timeline/actions/SaveSnapshot.java
index a4b131e50b1ecffce3d195f057a2fe92b36f42e1..ddc7ab7014bebd079dd8be9360fa2e07f987de43 100644
--- a/Timeline/src/org/sleuthkit/autopsy/advancedtimeline/actions/SaveSnapshot.java
+++ b/Timeline/src/org/sleuthkit/autopsy/timeline/actions/SaveSnapshot.java
@@ -16,7 +16,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.sleuthkit.autopsy.advancedtimeline.actions;
+package org.sleuthkit.autopsy.timeline.actions;
 
 import java.io.File;
 import java.io.FileNotFoundException;
@@ -36,8 +36,8 @@
 import javafx.util.Pair;
 import javax.imageio.ImageIO;
 import org.controlsfx.control.action.AbstractAction;
-import org.sleuthkit.autopsy.advancedtimeline.TimeLineController;
-import org.sleuthkit.autopsy.advancedtimeline.zooming.ZoomParams;
+import org.sleuthkit.autopsy.timeline.TimeLineController;
+import org.sleuthkit.autopsy.timeline.zooming.ZoomParams;
 import org.sleuthkit.autopsy.casemodule.Case;
 import org.sleuthkit.autopsy.coreutils.Logger;
 import org.sleuthkit.datamodel.TskCoreException;
diff --git a/Timeline/src/org/sleuthkit/autopsy/advancedtimeline/actions/SwingMenuItemAdapter.java b/Timeline/src/org/sleuthkit/autopsy/timeline/actions/SwingMenuItemAdapter.java
similarity index 97%
rename from Timeline/src/org/sleuthkit/autopsy/advancedtimeline/actions/SwingMenuItemAdapter.java
rename to Timeline/src/org/sleuthkit/autopsy/timeline/actions/SwingMenuItemAdapter.java
index 02f4e9a502ab80daa9d88f50ca6dd89584837936..85f7e5552d3118e2c42225372c74c097690d3271 100644
--- a/Timeline/src/org/sleuthkit/autopsy/advancedtimeline/actions/SwingMenuItemAdapter.java
+++ b/Timeline/src/org/sleuthkit/autopsy/timeline/actions/SwingMenuItemAdapter.java
@@ -16,7 +16,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.sleuthkit.autopsy.advancedtimeline.actions;
+package org.sleuthkit.autopsy.timeline.actions;
 
 import javafx.event.ActionEvent;
 import javafx.scene.control.Menu;
diff --git a/Timeline/src/org/sleuthkit/autopsy/advancedtimeline/actions/ZoomOut.java b/Timeline/src/org/sleuthkit/autopsy/timeline/actions/ZoomOut.java
similarity index 89%
rename from Timeline/src/org/sleuthkit/autopsy/advancedtimeline/actions/ZoomOut.java
rename to Timeline/src/org/sleuthkit/autopsy/timeline/actions/ZoomOut.java
index 0999e8664a6aff7156787b9c288d120905f49403..3925efc9f3a858e73c6f59c919fc8c5bc5fea05d 100644
--- a/Timeline/src/org/sleuthkit/autopsy/advancedtimeline/actions/ZoomOut.java
+++ b/Timeline/src/org/sleuthkit/autopsy/timeline/actions/ZoomOut.java
@@ -16,13 +16,13 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.sleuthkit.autopsy.advancedtimeline.actions;
+package org.sleuthkit.autopsy.timeline.actions;
 
 import javafx.beans.binding.BooleanBinding;
 import javafx.event.ActionEvent;
 import org.controlsfx.control.action.AbstractAction;
-import org.sleuthkit.autopsy.advancedtimeline.TimeLineController;
-import org.sleuthkit.autopsy.advancedtimeline.events.FilteredEventsModel;
+import org.sleuthkit.autopsy.timeline.TimeLineController;
+import org.sleuthkit.autopsy.timeline.events.FilteredEventsModel;
 
 /**
  *
diff --git a/Timeline/src/org/sleuthkit/autopsy/advancedtimeline/events/AggregateEvent.java b/Timeline/src/org/sleuthkit/autopsy/timeline/events/AggregateEvent.java
similarity index 92%
rename from Timeline/src/org/sleuthkit/autopsy/advancedtimeline/events/AggregateEvent.java
rename to Timeline/src/org/sleuthkit/autopsy/timeline/events/AggregateEvent.java
index e1fe240210bc5fdbb498bfbe1fcf2a6ecf246eac..c97008328d5762c39b32c408aaa646277ef5fb12 100644
--- a/Timeline/src/org/sleuthkit/autopsy/advancedtimeline/events/AggregateEvent.java
+++ b/Timeline/src/org/sleuthkit/autopsy/timeline/events/AggregateEvent.java
@@ -16,7 +16,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.sleuthkit.autopsy.advancedtimeline.events;
+package org.sleuthkit.autopsy.timeline.events;
 
 import com.google.common.collect.Collections2;
 import java.util.Collections;
@@ -26,9 +26,9 @@
 import javax.annotation.concurrent.Immutable;
 import org.joda.time.Interval;
 import org.openide.util.NbBundle;
-import org.sleuthkit.autopsy.advancedtimeline.events.type.EventType;
-import org.sleuthkit.autopsy.advancedtimeline.utils.IntervalUtils;
-import org.sleuthkit.autopsy.advancedtimeline.zooming.DescriptionLOD;
+import org.sleuthkit.autopsy.timeline.events.type.EventType;
+import org.sleuthkit.autopsy.timeline.utils.IntervalUtils;
+import org.sleuthkit.autopsy.timeline.zooming.DescriptionLOD;
 
 /** An event that represent a set of other events aggregated together. All the
  * sub events should have the same type and matching descriptions at the
diff --git a/Timeline/src/org/sleuthkit/autopsy/advancedtimeline/events/FilteredEventsModel.java b/Timeline/src/org/sleuthkit/autopsy/timeline/events/FilteredEventsModel.java
similarity index 93%
rename from Timeline/src/org/sleuthkit/autopsy/advancedtimeline/events/FilteredEventsModel.java
rename to Timeline/src/org/sleuthkit/autopsy/timeline/events/FilteredEventsModel.java
index 5cbc50ab8b8b179acf8d9fcc2d59306c9c5d1d0d..6bd3481d42dee7672315f3ec6cfcc2a95e328c6a 100644
--- a/Timeline/src/org/sleuthkit/autopsy/advancedtimeline/events/FilteredEventsModel.java
+++ b/Timeline/src/org/sleuthkit/autopsy/timeline/events/FilteredEventsModel.java
@@ -16,7 +16,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.sleuthkit.autopsy.advancedtimeline.events;
+package org.sleuthkit.autopsy.timeline.events;
 
 import java.util.Collection;
 import java.util.EnumSet;
@@ -28,14 +28,14 @@
 import javax.annotation.concurrent.GuardedBy;
 import org.joda.time.DateTimeZone;
 import org.joda.time.Interval;
-import org.sleuthkit.autopsy.advancedtimeline.TimeLineView;
-import org.sleuthkit.autopsy.advancedtimeline.events.db.EventsRepository;
-import org.sleuthkit.autopsy.advancedtimeline.events.type.EventType;
-import org.sleuthkit.autopsy.advancedtimeline.filters.Filter;
-import org.sleuthkit.autopsy.advancedtimeline.filters.IntersectionFilter;
-import org.sleuthkit.autopsy.advancedtimeline.zooming.DescriptionLOD;
-import org.sleuthkit.autopsy.advancedtimeline.zooming.EventTypeZoomLevel;
-import org.sleuthkit.autopsy.advancedtimeline.zooming.ZoomParams;
+import org.sleuthkit.autopsy.timeline.TimeLineView;
+import org.sleuthkit.autopsy.timeline.events.db.EventsRepository;
+import org.sleuthkit.autopsy.timeline.events.type.EventType;
+import org.sleuthkit.autopsy.timeline.filters.Filter;
+import org.sleuthkit.autopsy.timeline.filters.IntersectionFilter;
+import org.sleuthkit.autopsy.timeline.zooming.DescriptionLOD;
+import org.sleuthkit.autopsy.timeline.zooming.EventTypeZoomLevel;
+import org.sleuthkit.autopsy.timeline.zooming.ZoomParams;
 
 /**
  * This class acts as the model for a {@link TimeLineView}
diff --git a/Timeline/src/org/sleuthkit/autopsy/advancedtimeline/events/TimeLineEvent.java b/Timeline/src/org/sleuthkit/autopsy/timeline/events/TimeLineEvent.java
similarity index 94%
rename from Timeline/src/org/sleuthkit/autopsy/advancedtimeline/events/TimeLineEvent.java
rename to Timeline/src/org/sleuthkit/autopsy/timeline/events/TimeLineEvent.java
index 6b192ba2f1a52b1ddbc5c0fe100dda7231e76f78..b1340db2347f780a3b98d93c9fd110a9b03d19c6 100644
--- a/Timeline/src/org/sleuthkit/autopsy/advancedtimeline/events/TimeLineEvent.java
+++ b/Timeline/src/org/sleuthkit/autopsy/timeline/events/TimeLineEvent.java
@@ -16,9 +16,9 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.sleuthkit.autopsy.advancedtimeline.events;
+package org.sleuthkit.autopsy.timeline.events;
 
-import org.sleuthkit.autopsy.advancedtimeline.events.type.EventType;
+import org.sleuthkit.autopsy.timeline.events.type.EventType;
 import org.sleuthkit.datamodel.TskData;
 
 /**
diff --git a/Timeline/src/org/sleuthkit/autopsy/advancedtimeline/events/db/EventDB.java b/Timeline/src/org/sleuthkit/autopsy/timeline/events/db/EventDB.java
similarity index 97%
rename from Timeline/src/org/sleuthkit/autopsy/advancedtimeline/events/db/EventDB.java
rename to Timeline/src/org/sleuthkit/autopsy/timeline/events/db/EventDB.java
index 629daf06f06ec838c1f5d6043ab15b202d4a590a..979317bee41c97eac43434c5a5d790d50e012df7 100644
--- a/Timeline/src/org/sleuthkit/autopsy/advancedtimeline/events/db/EventDB.java
+++ b/Timeline/src/org/sleuthkit/autopsy/timeline/events/db/EventDB.java
@@ -16,7 +16,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.sleuthkit.autopsy.advancedtimeline.events.db;
+package org.sleuthkit.autopsy.timeline.events.db;
 
 import com.google.common.base.Stopwatch;
 import com.google.common.collect.HashMultimap;
@@ -50,23 +50,23 @@
 import org.joda.time.Interval;
 import org.joda.time.Period;
 import org.openide.util.Exceptions;
-import org.sleuthkit.autopsy.advancedtimeline.TimeLineController;
-import org.sleuthkit.autopsy.advancedtimeline.events.AggregateEvent;
-import org.sleuthkit.autopsy.advancedtimeline.events.TimeLineEvent;
-import org.sleuthkit.autopsy.advancedtimeline.events.type.BaseTypes;
-import org.sleuthkit.autopsy.advancedtimeline.events.type.EventType;
-import org.sleuthkit.autopsy.advancedtimeline.events.type.RootEventType;
-import org.sleuthkit.autopsy.advancedtimeline.filters.Filter;
-import org.sleuthkit.autopsy.advancedtimeline.filters.HideKnownFilter;
-import org.sleuthkit.autopsy.advancedtimeline.filters.IntersectionFilter;
-import org.sleuthkit.autopsy.advancedtimeline.filters.TextFilter;
-import org.sleuthkit.autopsy.advancedtimeline.filters.TypeFilter;
-import org.sleuthkit.autopsy.advancedtimeline.filters.UnionFilter;
-import org.sleuthkit.autopsy.advancedtimeline.utils.RangeDivisionInfo;
-import org.sleuthkit.autopsy.advancedtimeline.zooming.DescriptionLOD;
-import org.sleuthkit.autopsy.advancedtimeline.zooming.EventTypeZoomLevel;
-import org.sleuthkit.autopsy.advancedtimeline.zooming.TimeUnits;
-import org.sleuthkit.autopsy.advancedtimeline.zooming.ZoomParams;
+import org.sleuthkit.autopsy.timeline.TimeLineController;
+import org.sleuthkit.autopsy.timeline.events.AggregateEvent;
+import org.sleuthkit.autopsy.timeline.events.TimeLineEvent;
+import org.sleuthkit.autopsy.timeline.events.type.BaseTypes;
+import org.sleuthkit.autopsy.timeline.events.type.EventType;
+import org.sleuthkit.autopsy.timeline.events.type.RootEventType;
+import org.sleuthkit.autopsy.timeline.filters.Filter;
+import org.sleuthkit.autopsy.timeline.filters.HideKnownFilter;
+import org.sleuthkit.autopsy.timeline.filters.IntersectionFilter;
+import org.sleuthkit.autopsy.timeline.filters.TextFilter;
+import org.sleuthkit.autopsy.timeline.filters.TypeFilter;
+import org.sleuthkit.autopsy.timeline.filters.UnionFilter;
+import org.sleuthkit.autopsy.timeline.utils.RangeDivisionInfo;
+import org.sleuthkit.autopsy.timeline.zooming.DescriptionLOD;
+import org.sleuthkit.autopsy.timeline.zooming.EventTypeZoomLevel;
+import org.sleuthkit.autopsy.timeline.zooming.TimeUnits;
+import org.sleuthkit.autopsy.timeline.zooming.ZoomParams;
 import org.sleuthkit.autopsy.coreutils.Logger;
 import org.sleuthkit.datamodel.TskData;
 import org.sqlite.SQLiteJDBCLoader;
diff --git a/Timeline/src/org/sleuthkit/autopsy/advancedtimeline/events/db/EventsRepository.java b/Timeline/src/org/sleuthkit/autopsy/timeline/events/db/EventsRepository.java
similarity index 95%
rename from Timeline/src/org/sleuthkit/autopsy/advancedtimeline/events/db/EventsRepository.java
rename to Timeline/src/org/sleuthkit/autopsy/timeline/events/db/EventsRepository.java
index c03f57dd5b6ce144351cd1f7bf576c95a988e588..da9bab52d8b97aef1095527120f2434361dbbe1f 100644
--- a/Timeline/src/org/sleuthkit/autopsy/advancedtimeline/events/db/EventsRepository.java
+++ b/Timeline/src/org/sleuthkit/autopsy/timeline/events/db/EventsRepository.java
@@ -16,7 +16,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.sleuthkit.autopsy.advancedtimeline.events.db;
+package org.sleuthkit.autopsy.timeline.events.db;
 
 import com.google.common.cache.CacheBuilder;
 import com.google.common.cache.CacheLoader;
@@ -37,16 +37,16 @@
 import javax.swing.SwingWorker;
 import org.apache.commons.lang3.StringUtils;
 import org.joda.time.Interval;
-import org.sleuthkit.autopsy.advancedtimeline.ProgressWindow;
-import org.sleuthkit.autopsy.advancedtimeline.events.AggregateEvent;
-import org.sleuthkit.autopsy.advancedtimeline.events.FilteredEventsModel;
-import org.sleuthkit.autopsy.advancedtimeline.events.TimeLineEvent;
-import org.sleuthkit.autopsy.advancedtimeline.events.type.ArtifactEventType;
-import org.sleuthkit.autopsy.advancedtimeline.events.type.EventType;
-import org.sleuthkit.autopsy.advancedtimeline.events.type.FileSystemTypes;
-import org.sleuthkit.autopsy.advancedtimeline.events.type.RootEventType;
-import org.sleuthkit.autopsy.advancedtimeline.filters.Filter;
-import org.sleuthkit.autopsy.advancedtimeline.zooming.ZoomParams;
+import org.sleuthkit.autopsy.timeline.ProgressWindow;
+import org.sleuthkit.autopsy.timeline.events.AggregateEvent;
+import org.sleuthkit.autopsy.timeline.events.FilteredEventsModel;
+import org.sleuthkit.autopsy.timeline.events.TimeLineEvent;
+import org.sleuthkit.autopsy.timeline.events.type.ArtifactEventType;
+import org.sleuthkit.autopsy.timeline.events.type.EventType;
+import org.sleuthkit.autopsy.timeline.events.type.FileSystemTypes;
+import org.sleuthkit.autopsy.timeline.events.type.RootEventType;
+import org.sleuthkit.autopsy.timeline.filters.Filter;
+import org.sleuthkit.autopsy.timeline.zooming.ZoomParams;
 import org.sleuthkit.autopsy.casemodule.Case;
 import org.sleuthkit.autopsy.coreutils.Logger;
 import org.sleuthkit.datamodel.AbstractFile;
diff --git a/Timeline/src/org/sleuthkit/autopsy/advancedtimeline/events/type/ArtifactEventType.java b/Timeline/src/org/sleuthkit/autopsy/timeline/events/type/ArtifactEventType.java
similarity index 99%
rename from Timeline/src/org/sleuthkit/autopsy/advancedtimeline/events/type/ArtifactEventType.java
rename to Timeline/src/org/sleuthkit/autopsy/timeline/events/type/ArtifactEventType.java
index ff956ccc63be8b155ecc79a35edaeeb557414e52..38a0de16c0272ff62c4252bee1a4a0f712b93113 100644
--- a/Timeline/src/org/sleuthkit/autopsy/advancedtimeline/events/type/ArtifactEventType.java
+++ b/Timeline/src/org/sleuthkit/autopsy/timeline/events/type/ArtifactEventType.java
@@ -16,7 +16,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.sleuthkit.autopsy.advancedtimeline.events.type;
+package org.sleuthkit.autopsy.timeline.events.type;
 
 import java.util.HashMap;
 import java.util.List;
diff --git a/Timeline/src/org/sleuthkit/autopsy/advancedtimeline/events/type/BaseTypes.java b/Timeline/src/org/sleuthkit/autopsy/timeline/events/type/BaseTypes.java
similarity index 95%
rename from Timeline/src/org/sleuthkit/autopsy/advancedtimeline/events/type/BaseTypes.java
rename to Timeline/src/org/sleuthkit/autopsy/timeline/events/type/BaseTypes.java
index 13ec44841ff4dc63357ec5e532834c26a6edf960..6ae47bcd4c693e25f4624edeca42cd9ab25c4d97 100644
--- a/Timeline/src/org/sleuthkit/autopsy/advancedtimeline/events/type/BaseTypes.java
+++ b/Timeline/src/org/sleuthkit/autopsy/timeline/events/type/BaseTypes.java
@@ -16,12 +16,12 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.sleuthkit.autopsy.advancedtimeline.events.type;
+package org.sleuthkit.autopsy.timeline.events.type;
 
 import java.util.Arrays;
 import java.util.List;
 import javafx.scene.image.Image;
-import org.sleuthkit.autopsy.advancedtimeline.zooming.EventTypeZoomLevel;
+import org.sleuthkit.autopsy.timeline.zooming.EventTypeZoomLevel;
 
 /**
  * RootTypes are event types that have no super type.
diff --git a/Timeline/src/org/sleuthkit/autopsy/advancedtimeline/events/type/EventType.java b/Timeline/src/org/sleuthkit/autopsy/timeline/events/type/EventType.java
similarity index 96%
rename from Timeline/src/org/sleuthkit/autopsy/advancedtimeline/events/type/EventType.java
rename to Timeline/src/org/sleuthkit/autopsy/timeline/events/type/EventType.java
index 2a020b7142e5427623f2099fb41c5e6d14a440dd..0507a4f572cc64be97918089f46356984a7c10a2 100644
--- a/Timeline/src/org/sleuthkit/autopsy/advancedtimeline/events/type/EventType.java
+++ b/Timeline/src/org/sleuthkit/autopsy/timeline/events/type/EventType.java
@@ -16,14 +16,14 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.sleuthkit.autopsy.advancedtimeline.events.type;
+package org.sleuthkit.autopsy.timeline.events.type;
 
 import java.util.ArrayList;
 import java.util.Comparator;
 import java.util.List;
 import javafx.scene.image.Image;
 import javafx.scene.paint.Color;
-import org.sleuthkit.autopsy.advancedtimeline.zooming.EventTypeZoomLevel;
+import org.sleuthkit.autopsy.timeline.zooming.EventTypeZoomLevel;
 
 /**
  * An Event Type represents a distinct kind of event ie file system or web
diff --git a/Timeline/src/org/sleuthkit/autopsy/advancedtimeline/events/type/FileSystemTypes.java b/Timeline/src/org/sleuthkit/autopsy/timeline/events/type/FileSystemTypes.java
similarity index 94%
rename from Timeline/src/org/sleuthkit/autopsy/advancedtimeline/events/type/FileSystemTypes.java
rename to Timeline/src/org/sleuthkit/autopsy/timeline/events/type/FileSystemTypes.java
index 601989e6e267cf06ab3a5ad19b7786f17fab232b..dfb573e382f69c3b059d5beac861835a16dd11d9 100644
--- a/Timeline/src/org/sleuthkit/autopsy/advancedtimeline/events/type/FileSystemTypes.java
+++ b/Timeline/src/org/sleuthkit/autopsy/timeline/events/type/FileSystemTypes.java
@@ -16,12 +16,12 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.sleuthkit.autopsy.advancedtimeline.events.type;
+package org.sleuthkit.autopsy.timeline.events.type;
 
 import java.util.Collections;
 import java.util.List;
 import javafx.scene.image.Image;
-import org.sleuthkit.autopsy.advancedtimeline.zooming.EventTypeZoomLevel;
+import org.sleuthkit.autopsy.timeline.zooming.EventTypeZoomLevel;
 
 /**
  *
diff --git a/Timeline/src/org/sleuthkit/autopsy/advancedtimeline/events/type/MiscTypes.java b/Timeline/src/org/sleuthkit/autopsy/timeline/events/type/MiscTypes.java
similarity index 98%
rename from Timeline/src/org/sleuthkit/autopsy/advancedtimeline/events/type/MiscTypes.java
rename to Timeline/src/org/sleuthkit/autopsy/timeline/events/type/MiscTypes.java
index e0391cdeb88c26406e7761abaf6b4f51c5557d51..aa6b07aa55dcc7e26805fcfbe5f7d6ccf84d09c5 100644
--- a/Timeline/src/org/sleuthkit/autopsy/advancedtimeline/events/type/MiscTypes.java
+++ b/Timeline/src/org/sleuthkit/autopsy/timeline/events/type/MiscTypes.java
@@ -16,7 +16,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.sleuthkit.autopsy.advancedtimeline.events.type;
+package org.sleuthkit.autopsy.timeline.events.type;
 
 import java.util.Arrays;
 import java.util.Collections;
@@ -26,7 +26,7 @@
 import javafx.scene.image.Image;
 import org.apache.commons.lang3.StringUtils;
 import org.openide.util.Exceptions;
-import org.sleuthkit.autopsy.advancedtimeline.zooming.EventTypeZoomLevel;
+import org.sleuthkit.autopsy.timeline.zooming.EventTypeZoomLevel;
 import org.sleuthkit.datamodel.BlackboardArtifact;
 import org.sleuthkit.datamodel.BlackboardAttribute;
 import org.sleuthkit.datamodel.TskCoreException;
diff --git a/Timeline/src/org/sleuthkit/autopsy/advancedtimeline/events/type/RootEventType.java b/Timeline/src/org/sleuthkit/autopsy/timeline/events/type/RootEventType.java
similarity index 94%
rename from Timeline/src/org/sleuthkit/autopsy/advancedtimeline/events/type/RootEventType.java
rename to Timeline/src/org/sleuthkit/autopsy/timeline/events/type/RootEventType.java
index 5434c7c772a14ffdebc283c02b0a9143ac0a68e1..79716db2f7693745513d308fc4da5460fe42f2eb 100644
--- a/Timeline/src/org/sleuthkit/autopsy/advancedtimeline/events/type/RootEventType.java
+++ b/Timeline/src/org/sleuthkit/autopsy/timeline/events/type/RootEventType.java
@@ -16,14 +16,14 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.sleuthkit.autopsy.advancedtimeline.events.type;
+package org.sleuthkit.autopsy.timeline.events.type;
 
 import java.util.Arrays;
 import java.util.Collections;
 import java.util.List;
 import javafx.scene.image.Image;
 import javafx.scene.paint.Color;
-import org.sleuthkit.autopsy.advancedtimeline.zooming.EventTypeZoomLevel;
+import org.sleuthkit.autopsy.timeline.zooming.EventTypeZoomLevel;
 
 /** A singleton {@link } EventType to represent the root type of all event
  * types. */
diff --git a/Timeline/src/org/sleuthkit/autopsy/advancedtimeline/events/type/WebTypes.java b/Timeline/src/org/sleuthkit/autopsy/timeline/events/type/WebTypes.java
similarity index 98%
rename from Timeline/src/org/sleuthkit/autopsy/advancedtimeline/events/type/WebTypes.java
rename to Timeline/src/org/sleuthkit/autopsy/timeline/events/type/WebTypes.java
index 72ea9f8ba2678cf436308fd305463c6bb3fdb396..853d37ec9ce88815b8ee810e6fabaeb325640ed9 100644
--- a/Timeline/src/org/sleuthkit/autopsy/advancedtimeline/events/type/WebTypes.java
+++ b/Timeline/src/org/sleuthkit/autopsy/timeline/events/type/WebTypes.java
@@ -16,7 +16,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.sleuthkit.autopsy.advancedtimeline.events.type;
+package org.sleuthkit.autopsy.timeline.events.type;
 
 import java.util.Collections;
 import java.util.List;
@@ -24,7 +24,7 @@
 import java.util.function.BiFunction;
 import javafx.scene.image.Image;
 import org.apache.commons.lang3.StringUtils;
-import org.sleuthkit.autopsy.advancedtimeline.zooming.EventTypeZoomLevel;
+import org.sleuthkit.autopsy.timeline.zooming.EventTypeZoomLevel;
 import org.sleuthkit.datamodel.BlackboardArtifact;
 import org.sleuthkit.datamodel.BlackboardAttribute;
 
diff --git a/Timeline/src/org/sleuthkit/autopsy/advancedtimeline/explorernodes/EventNode.java b/Timeline/src/org/sleuthkit/autopsy/timeline/explorernodes/EventNode.java
similarity index 96%
rename from Timeline/src/org/sleuthkit/autopsy/advancedtimeline/explorernodes/EventNode.java
rename to Timeline/src/org/sleuthkit/autopsy/timeline/explorernodes/EventNode.java
index 1bb11f7c23216531389e19790540cad6c099e88e..11a760e4646fe8c88f8228c190f3466705a102a7 100644
--- a/Timeline/src/org/sleuthkit/autopsy/advancedtimeline/explorernodes/EventNode.java
+++ b/Timeline/src/org/sleuthkit/autopsy/timeline/explorernodes/EventNode.java
@@ -16,7 +16,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.sleuthkit.autopsy.advancedtimeline.explorernodes;
+package org.sleuthkit.autopsy.timeline.explorernodes;
 
 import java.lang.reflect.InvocationTargetException;
 import java.util.ArrayList;
@@ -31,8 +31,8 @@
 import org.openide.nodes.Sheet;
 import org.openide.util.Exceptions;
 import org.openide.util.lookup.Lookups;
-import org.sleuthkit.autopsy.advancedtimeline.TimeLineController;
-import org.sleuthkit.autopsy.advancedtimeline.events.TimeLineEvent;
+import org.sleuthkit.autopsy.timeline.TimeLineController;
+import org.sleuthkit.autopsy.timeline.events.TimeLineEvent;
 import org.sleuthkit.autopsy.datamodel.DataModelActionsFactory;
 import org.sleuthkit.autopsy.datamodel.DisplayableItemNode;
 import org.sleuthkit.autopsy.datamodel.DisplayableItemNodeVisitor;
diff --git a/Timeline/src/org/sleuthkit/autopsy/advancedtimeline/explorernodes/EventRootNode.java b/Timeline/src/org/sleuthkit/autopsy/timeline/explorernodes/EventRootNode.java
similarity index 94%
rename from Timeline/src/org/sleuthkit/autopsy/advancedtimeline/explorernodes/EventRootNode.java
rename to Timeline/src/org/sleuthkit/autopsy/timeline/explorernodes/EventRootNode.java
index 6de98bedf453493ae2821e1e3af41a65dd1eeb65..7716d392d9ab199bae4be9216cef4be8e7c8bcb5 100644
--- a/Timeline/src/org/sleuthkit/autopsy/advancedtimeline/explorernodes/EventRootNode.java
+++ b/Timeline/src/org/sleuthkit/autopsy/timeline/explorernodes/EventRootNode.java
@@ -16,7 +16,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.sleuthkit.autopsy.advancedtimeline.explorernodes;
+package org.sleuthkit.autopsy.timeline.explorernodes;
 
 import java.util.Collection;
 import java.util.List;
@@ -26,9 +26,9 @@
 import org.openide.nodes.Children;
 import org.openide.nodes.Node;
 import org.openide.util.lookup.Lookups;
-import org.sleuthkit.autopsy.advancedtimeline.events.FilteredEventsModel;
-import org.sleuthkit.autopsy.advancedtimeline.events.TimeLineEvent;
-import org.sleuthkit.autopsy.advancedtimeline.events.type.BaseTypes;
+import org.sleuthkit.autopsy.timeline.events.FilteredEventsModel;
+import org.sleuthkit.autopsy.timeline.events.TimeLineEvent;
+import org.sleuthkit.autopsy.timeline.events.type.BaseTypes;
 import org.sleuthkit.autopsy.casemodule.Case;
 import org.sleuthkit.autopsy.coreutils.Logger;
 import org.sleuthkit.autopsy.datamodel.DisplayableItemNode;
diff --git a/Timeline/src/org/sleuthkit/autopsy/advancedtimeline/filters/AbstractFilter.java b/Timeline/src/org/sleuthkit/autopsy/timeline/filters/AbstractFilter.java
similarity index 95%
rename from Timeline/src/org/sleuthkit/autopsy/advancedtimeline/filters/AbstractFilter.java
rename to Timeline/src/org/sleuthkit/autopsy/timeline/filters/AbstractFilter.java
index fc865e6e3fc6c612248294afa4224effe0b34b4b..4e4f122f24b8731f66c0e19d82893baa931e7e25 100644
--- a/Timeline/src/org/sleuthkit/autopsy/advancedtimeline/filters/AbstractFilter.java
+++ b/Timeline/src/org/sleuthkit/autopsy/timeline/filters/AbstractFilter.java
@@ -2,7 +2,7 @@
  * To change this template, choose Tools | Templates
  * and open the template in the editor.
  */
-package org.sleuthkit.autopsy.advancedtimeline.filters;
+package org.sleuthkit.autopsy.timeline.filters;
 
 import javafx.beans.property.SimpleBooleanProperty;
 
diff --git a/Timeline/src/org/sleuthkit/autopsy/advancedtimeline/filters/CompoundFilter.java b/Timeline/src/org/sleuthkit/autopsy/timeline/filters/CompoundFilter.java
similarity index 98%
rename from Timeline/src/org/sleuthkit/autopsy/advancedtimeline/filters/CompoundFilter.java
rename to Timeline/src/org/sleuthkit/autopsy/timeline/filters/CompoundFilter.java
index 2bb0c48df0cce3a5d56ded8202169cec98a742e0..f1fab113c2581f24efd1b2d42ace28d4636ef2a3 100644
--- a/Timeline/src/org/sleuthkit/autopsy/advancedtimeline/filters/CompoundFilter.java
+++ b/Timeline/src/org/sleuthkit/autopsy/timeline/filters/CompoundFilter.java
@@ -2,7 +2,7 @@
  * To change this template, choose Tools | Templates
  * and open the template in the editor.
  */
-package org.sleuthkit.autopsy.advancedtimeline.filters;
+package org.sleuthkit.autopsy.timeline.filters;
 
 import java.util.List;
 import javafx.beans.Observable;
diff --git a/Timeline/src/org/sleuthkit/autopsy/advancedtimeline/filters/Filter.java b/Timeline/src/org/sleuthkit/autopsy/timeline/filters/Filter.java
similarity index 95%
rename from Timeline/src/org/sleuthkit/autopsy/advancedtimeline/filters/Filter.java
rename to Timeline/src/org/sleuthkit/autopsy/timeline/filters/Filter.java
index a42f33d0d35bc4d2729c4b2b175f0ad8fcb7b4ca..df07d23ffa7443ef6bcd71d75e1fd35799a4767b 100644
--- a/Timeline/src/org/sleuthkit/autopsy/advancedtimeline/filters/Filter.java
+++ b/Timeline/src/org/sleuthkit/autopsy/timeline/filters/Filter.java
@@ -16,12 +16,12 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.sleuthkit.autopsy.advancedtimeline.filters;
+package org.sleuthkit.autopsy.timeline.filters;
 
 import javafx.beans.property.SimpleBooleanProperty;
 import javafx.collections.FXCollections;
 import javafx.collections.ObservableList;
-import org.sleuthkit.autopsy.advancedtimeline.events.type.RootEventType;
+import org.sleuthkit.autopsy.timeline.events.type.RootEventType;
 
 /** Interface for Filters */
 public interface Filter {
diff --git a/Timeline/src/org/sleuthkit/autopsy/advancedtimeline/filters/HideKnownFilter.java b/Timeline/src/org/sleuthkit/autopsy/timeline/filters/HideKnownFilter.java
similarity index 96%
rename from Timeline/src/org/sleuthkit/autopsy/advancedtimeline/filters/HideKnownFilter.java
rename to Timeline/src/org/sleuthkit/autopsy/timeline/filters/HideKnownFilter.java
index a7baee7b4fd04c51b3815fc84b5ba5068d0a5843..86c36ce5fe26534861500879d11ee24c5c2640f8 100644
--- a/Timeline/src/org/sleuthkit/autopsy/advancedtimeline/filters/HideKnownFilter.java
+++ b/Timeline/src/org/sleuthkit/autopsy/timeline/filters/HideKnownFilter.java
@@ -16,7 +16,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.sleuthkit.autopsy.advancedtimeline.filters;
+package org.sleuthkit.autopsy.timeline.filters;
 
 /**
  * Filter to hide known files
diff --git a/Timeline/src/org/sleuthkit/autopsy/advancedtimeline/filters/IntersectionFilter.java b/Timeline/src/org/sleuthkit/autopsy/timeline/filters/IntersectionFilter.java
similarity index 97%
rename from Timeline/src/org/sleuthkit/autopsy/advancedtimeline/filters/IntersectionFilter.java
rename to Timeline/src/org/sleuthkit/autopsy/timeline/filters/IntersectionFilter.java
index 16c881d7928498fe1cafc92819917853bccf6c6a..b11b0f53b7f5718ec4efad9d46e72a91e599be4d 100644
--- a/Timeline/src/org/sleuthkit/autopsy/advancedtimeline/filters/IntersectionFilter.java
+++ b/Timeline/src/org/sleuthkit/autopsy/timeline/filters/IntersectionFilter.java
@@ -2,7 +2,7 @@
  * To change this template, choose Tools | Templates
  * and open the template in the editor.
  */
-package org.sleuthkit.autopsy.advancedtimeline.filters;
+package org.sleuthkit.autopsy.timeline.filters;
 
 import java.util.stream.Collectors;
 import javafx.collections.FXCollections;
diff --git a/Timeline/src/org/sleuthkit/autopsy/advancedtimeline/filters/TextFilter.java b/Timeline/src/org/sleuthkit/autopsy/timeline/filters/TextFilter.java
similarity index 97%
rename from Timeline/src/org/sleuthkit/autopsy/advancedtimeline/filters/TextFilter.java
rename to Timeline/src/org/sleuthkit/autopsy/timeline/filters/TextFilter.java
index b36f1d4348ef0a3912f49f6e4958a63c60d1a3a2..44a38c30e9a793ee1cb9593e100f921aa784c0a2 100644
--- a/Timeline/src/org/sleuthkit/autopsy/advancedtimeline/filters/TextFilter.java
+++ b/Timeline/src/org/sleuthkit/autopsy/timeline/filters/TextFilter.java
@@ -16,7 +16,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.sleuthkit.autopsy.advancedtimeline.filters;
+package org.sleuthkit.autopsy.timeline.filters;
 
 import java.util.Objects;
 import javafx.beans.property.Property;
diff --git a/Timeline/src/org/sleuthkit/autopsy/advancedtimeline/filters/TypeFilter.java b/Timeline/src/org/sleuthkit/autopsy/timeline/filters/TypeFilter.java
similarity index 95%
rename from Timeline/src/org/sleuthkit/autopsy/advancedtimeline/filters/TypeFilter.java
rename to Timeline/src/org/sleuthkit/autopsy/timeline/filters/TypeFilter.java
index 35d506fc1abc1d4fb3fea102c1e9d2bea47423e6..0306e463d9203f0cbe73a56f4b763ccf306d9aa5 100644
--- a/Timeline/src/org/sleuthkit/autopsy/advancedtimeline/filters/TypeFilter.java
+++ b/Timeline/src/org/sleuthkit/autopsy/timeline/filters/TypeFilter.java
@@ -16,15 +16,15 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.sleuthkit.autopsy.advancedtimeline.filters;
+package org.sleuthkit.autopsy.timeline.filters;
 
 import java.util.Objects;
 import java.util.stream.Collectors;
 import javafx.collections.FXCollections;
 import javafx.scene.image.Image;
 import javafx.scene.paint.Color;
-import org.sleuthkit.autopsy.advancedtimeline.events.type.EventType;
-import org.sleuthkit.autopsy.advancedtimeline.events.type.RootEventType;
+import org.sleuthkit.autopsy.timeline.events.type.EventType;
+import org.sleuthkit.autopsy.timeline.events.type.RootEventType;
 
 /** Event Type Filter. An instance of TypeFilter is usually a tree that
  * parallels the event type hierarchy with one filter/node for each event type. */
diff --git a/Timeline/src/org/sleuthkit/autopsy/advancedtimeline/filters/UnionFilter.java b/Timeline/src/org/sleuthkit/autopsy/timeline/filters/UnionFilter.java
similarity index 89%
rename from Timeline/src/org/sleuthkit/autopsy/advancedtimeline/filters/UnionFilter.java
rename to Timeline/src/org/sleuthkit/autopsy/timeline/filters/UnionFilter.java
index 2eb9c08d8dc79d447d16c3eddd9e8d1237224e02..b4d4db64f669c058d0d53389c59fa2e70db8f658 100644
--- a/Timeline/src/org/sleuthkit/autopsy/advancedtimeline/filters/UnionFilter.java
+++ b/Timeline/src/org/sleuthkit/autopsy/timeline/filters/UnionFilter.java
@@ -2,7 +2,7 @@
  * To change this template, choose Tools | Templates
  * and open the template in the editor.
  */
-package org.sleuthkit.autopsy.advancedtimeline.filters;
+package org.sleuthkit.autopsy.timeline.filters;
 
 import javafx.collections.FXCollections;
 import javafx.collections.ObservableList;
diff --git a/Timeline/src/org/sleuthkit/autopsy/advancedtimeline/images/20140521121247760_easyicon_net_32.png b/Timeline/src/org/sleuthkit/autopsy/timeline/images/20140521121247760_easyicon_net_32.png
similarity index 100%
rename from Timeline/src/org/sleuthkit/autopsy/advancedtimeline/images/20140521121247760_easyicon_net_32.png
rename to Timeline/src/org/sleuthkit/autopsy/timeline/images/20140521121247760_easyicon_net_32.png
diff --git a/Timeline/src/org/sleuthkit/autopsy/advancedtimeline/images/20140521121247760_easyicon_net_32_colorized.png b/Timeline/src/org/sleuthkit/autopsy/timeline/images/20140521121247760_easyicon_net_32_colorized.png
similarity index 100%
rename from Timeline/src/org/sleuthkit/autopsy/advancedtimeline/images/20140521121247760_easyicon_net_32_colorized.png
rename to Timeline/src/org/sleuthkit/autopsy/timeline/images/20140521121247760_easyicon_net_32_colorized.png
diff --git a/Timeline/src/org/sleuthkit/autopsy/advancedtimeline/images/arrow-090.png b/Timeline/src/org/sleuthkit/autopsy/timeline/images/arrow-090.png
similarity index 100%
rename from Timeline/src/org/sleuthkit/autopsy/advancedtimeline/images/arrow-090.png
rename to Timeline/src/org/sleuthkit/autopsy/timeline/images/arrow-090.png
diff --git a/Timeline/src/org/sleuthkit/autopsy/advancedtimeline/images/arrow-180.png b/Timeline/src/org/sleuthkit/autopsy/timeline/images/arrow-180.png
similarity index 100%
rename from Timeline/src/org/sleuthkit/autopsy/advancedtimeline/images/arrow-180.png
rename to Timeline/src/org/sleuthkit/autopsy/timeline/images/arrow-180.png
diff --git a/Timeline/src/org/sleuthkit/autopsy/advancedtimeline/images/arrow-270.png b/Timeline/src/org/sleuthkit/autopsy/timeline/images/arrow-270.png
similarity index 100%
rename from Timeline/src/org/sleuthkit/autopsy/advancedtimeline/images/arrow-270.png
rename to Timeline/src/org/sleuthkit/autopsy/timeline/images/arrow-270.png
diff --git a/Timeline/src/org/sleuthkit/autopsy/advancedtimeline/images/arrow-circle-double-135.png b/Timeline/src/org/sleuthkit/autopsy/timeline/images/arrow-circle-double-135.png
similarity index 100%
rename from Timeline/src/org/sleuthkit/autopsy/advancedtimeline/images/arrow-circle-double-135.png
rename to Timeline/src/org/sleuthkit/autopsy/timeline/images/arrow-circle-double-135.png
diff --git a/Timeline/src/org/sleuthkit/autopsy/advancedtimeline/images/arrow-in.png b/Timeline/src/org/sleuthkit/autopsy/timeline/images/arrow-in.png
similarity index 100%
rename from Timeline/src/org/sleuthkit/autopsy/advancedtimeline/images/arrow-in.png
rename to Timeline/src/org/sleuthkit/autopsy/timeline/images/arrow-in.png
diff --git a/Timeline/src/org/sleuthkit/autopsy/advancedtimeline/images/arrow-out.png b/Timeline/src/org/sleuthkit/autopsy/timeline/images/arrow-out.png
similarity index 100%
rename from Timeline/src/org/sleuthkit/autopsy/advancedtimeline/images/arrow-out.png
rename to Timeline/src/org/sleuthkit/autopsy/timeline/images/arrow-out.png
diff --git a/Timeline/src/org/sleuthkit/autopsy/advancedtimeline/images/arrow-step-out.png b/Timeline/src/org/sleuthkit/autopsy/timeline/images/arrow-step-out.png
similarity index 100%
rename from Timeline/src/org/sleuthkit/autopsy/advancedtimeline/images/arrow-step-out.png
rename to Timeline/src/org/sleuthkit/autopsy/timeline/images/arrow-step-out.png
diff --git a/Timeline/src/org/sleuthkit/autopsy/advancedtimeline/images/arrow-step.png b/Timeline/src/org/sleuthkit/autopsy/timeline/images/arrow-step.png
similarity index 100%
rename from Timeline/src/org/sleuthkit/autopsy/advancedtimeline/images/arrow-step.png
rename to Timeline/src/org/sleuthkit/autopsy/timeline/images/arrow-step.png
diff --git a/Timeline/src/org/sleuthkit/autopsy/advancedtimeline/images/arrow.png b/Timeline/src/org/sleuthkit/autopsy/timeline/images/arrow.png
similarity index 100%
rename from Timeline/src/org/sleuthkit/autopsy/advancedtimeline/images/arrow.png
rename to Timeline/src/org/sleuthkit/autopsy/timeline/images/arrow.png
diff --git a/Timeline/src/org/sleuthkit/autopsy/advancedtimeline/images/arrow_in.png b/Timeline/src/org/sleuthkit/autopsy/timeline/images/arrow_in.png
similarity index 100%
rename from Timeline/src/org/sleuthkit/autopsy/advancedtimeline/images/arrow_in.png
rename to Timeline/src/org/sleuthkit/autopsy/timeline/images/arrow_in.png
diff --git a/Timeline/src/org/sleuthkit/autopsy/advancedtimeline/images/arrow_out.png b/Timeline/src/org/sleuthkit/autopsy/timeline/images/arrow_out.png
similarity index 100%
rename from Timeline/src/org/sleuthkit/autopsy/advancedtimeline/images/arrow_out.png
rename to Timeline/src/org/sleuthkit/autopsy/timeline/images/arrow_out.png
diff --git a/Timeline/src/org/sleuthkit/autopsy/advancedtimeline/images/block.png b/Timeline/src/org/sleuthkit/autopsy/timeline/images/block.png
similarity index 100%
rename from Timeline/src/org/sleuthkit/autopsy/advancedtimeline/images/block.png
rename to Timeline/src/org/sleuthkit/autopsy/timeline/images/block.png
diff --git a/Timeline/src/org/sleuthkit/autopsy/advancedtimeline/images/blue-document-attribute-a.png b/Timeline/src/org/sleuthkit/autopsy/timeline/images/blue-document-attribute-a.png
similarity index 100%
rename from Timeline/src/org/sleuthkit/autopsy/advancedtimeline/images/blue-document-attribute-a.png
rename to Timeline/src/org/sleuthkit/autopsy/timeline/images/blue-document-attribute-a.png
diff --git a/Timeline/src/org/sleuthkit/autopsy/advancedtimeline/images/blue-document-attribute-b.png b/Timeline/src/org/sleuthkit/autopsy/timeline/images/blue-document-attribute-b.png
similarity index 100%
rename from Timeline/src/org/sleuthkit/autopsy/advancedtimeline/images/blue-document-attribute-b.png
rename to Timeline/src/org/sleuthkit/autopsy/timeline/images/blue-document-attribute-b.png
diff --git a/Timeline/src/org/sleuthkit/autopsy/advancedtimeline/images/blue-document-attribute-c.png b/Timeline/src/org/sleuthkit/autopsy/timeline/images/blue-document-attribute-c.png
similarity index 100%
rename from Timeline/src/org/sleuthkit/autopsy/advancedtimeline/images/blue-document-attribute-c.png
rename to Timeline/src/org/sleuthkit/autopsy/timeline/images/blue-document-attribute-c.png
diff --git a/Timeline/src/org/sleuthkit/autopsy/advancedtimeline/images/blue-document-attribute-m.png b/Timeline/src/org/sleuthkit/autopsy/timeline/images/blue-document-attribute-m.png
similarity index 100%
rename from Timeline/src/org/sleuthkit/autopsy/advancedtimeline/images/blue-document-attribute-m.png
rename to Timeline/src/org/sleuthkit/autopsy/timeline/images/blue-document-attribute-m.png
diff --git a/Timeline/src/org/sleuthkit/autopsy/advancedtimeline/images/blue-document.png b/Timeline/src/org/sleuthkit/autopsy/timeline/images/blue-document.png
similarity index 100%
rename from Timeline/src/org/sleuthkit/autopsy/advancedtimeline/images/blue-document.png
rename to Timeline/src/org/sleuthkit/autopsy/timeline/images/blue-document.png
diff --git a/Timeline/src/org/sleuthkit/autopsy/advancedtimeline/images/bookmark--plus.png b/Timeline/src/org/sleuthkit/autopsy/timeline/images/bookmark--plus.png
similarity index 100%
rename from Timeline/src/org/sleuthkit/autopsy/advancedtimeline/images/bookmark--plus.png
rename to Timeline/src/org/sleuthkit/autopsy/timeline/images/bookmark--plus.png
diff --git a/Timeline/src/org/sleuthkit/autopsy/advancedtimeline/images/bookmarks.png b/Timeline/src/org/sleuthkit/autopsy/timeline/images/bookmarks.png
similarity index 100%
rename from Timeline/src/org/sleuthkit/autopsy/advancedtimeline/images/bookmarks.png
rename to Timeline/src/org/sleuthkit/autopsy/timeline/images/bookmarks.png
diff --git a/Timeline/src/org/sleuthkit/autopsy/advancedtimeline/images/btn_step_back.png b/Timeline/src/org/sleuthkit/autopsy/timeline/images/btn_step_back.png
similarity index 100%
rename from Timeline/src/org/sleuthkit/autopsy/advancedtimeline/images/btn_step_back.png
rename to Timeline/src/org/sleuthkit/autopsy/timeline/images/btn_step_back.png
diff --git a/Timeline/src/org/sleuthkit/autopsy/advancedtimeline/images/btn_step_back_disabled.png b/Timeline/src/org/sleuthkit/autopsy/timeline/images/btn_step_back_disabled.png
similarity index 100%
rename from Timeline/src/org/sleuthkit/autopsy/advancedtimeline/images/btn_step_back_disabled.png
rename to Timeline/src/org/sleuthkit/autopsy/timeline/images/btn_step_back_disabled.png
diff --git a/Timeline/src/org/sleuthkit/autopsy/advancedtimeline/images/btn_step_back_hover.png b/Timeline/src/org/sleuthkit/autopsy/timeline/images/btn_step_back_hover.png
similarity index 100%
rename from Timeline/src/org/sleuthkit/autopsy/advancedtimeline/images/btn_step_back_hover.png
rename to Timeline/src/org/sleuthkit/autopsy/timeline/images/btn_step_back_hover.png
diff --git a/Timeline/src/org/sleuthkit/autopsy/advancedtimeline/images/btn_step_forward.png b/Timeline/src/org/sleuthkit/autopsy/timeline/images/btn_step_forward.png
similarity index 100%
rename from Timeline/src/org/sleuthkit/autopsy/advancedtimeline/images/btn_step_forward.png
rename to Timeline/src/org/sleuthkit/autopsy/timeline/images/btn_step_forward.png
diff --git a/Timeline/src/org/sleuthkit/autopsy/advancedtimeline/images/btn_step_forward_disabled.png b/Timeline/src/org/sleuthkit/autopsy/timeline/images/btn_step_forward_disabled.png
similarity index 100%
rename from Timeline/src/org/sleuthkit/autopsy/advancedtimeline/images/btn_step_forward_disabled.png
rename to Timeline/src/org/sleuthkit/autopsy/timeline/images/btn_step_forward_disabled.png
diff --git a/Timeline/src/org/sleuthkit/autopsy/advancedtimeline/images/btn_step_forward_hover.png b/Timeline/src/org/sleuthkit/autopsy/timeline/images/btn_step_forward_hover.png
similarity index 100%
rename from Timeline/src/org/sleuthkit/autopsy/advancedtimeline/images/btn_step_forward_hover.png
rename to Timeline/src/org/sleuthkit/autopsy/timeline/images/btn_step_forward_hover.png
diff --git a/Timeline/src/org/sleuthkit/autopsy/advancedtimeline/images/calllog.png b/Timeline/src/org/sleuthkit/autopsy/timeline/images/calllog.png
similarity index 100%
rename from Timeline/src/org/sleuthkit/autopsy/advancedtimeline/images/calllog.png
rename to Timeline/src/org/sleuthkit/autopsy/timeline/images/calllog.png
diff --git a/Timeline/src/org/sleuthkit/autopsy/advancedtimeline/images/camera-icon-16.png b/Timeline/src/org/sleuthkit/autopsy/timeline/images/camera-icon-16.png
similarity index 100%
rename from Timeline/src/org/sleuthkit/autopsy/advancedtimeline/images/camera-icon-16.png
rename to Timeline/src/org/sleuthkit/autopsy/timeline/images/camera-icon-16.png
diff --git a/Timeline/src/org/sleuthkit/autopsy/advancedtimeline/images/chart_bar.png b/Timeline/src/org/sleuthkit/autopsy/timeline/images/chart_bar.png
similarity index 100%
rename from Timeline/src/org/sleuthkit/autopsy/advancedtimeline/images/chart_bar.png
rename to Timeline/src/org/sleuthkit/autopsy/timeline/images/chart_bar.png
diff --git a/Timeline/src/org/sleuthkit/autopsy/advancedtimeline/images/checker64.jpg b/Timeline/src/org/sleuthkit/autopsy/timeline/images/checker64.jpg
similarity index 100%
rename from Timeline/src/org/sleuthkit/autopsy/advancedtimeline/images/checker64.jpg
rename to Timeline/src/org/sleuthkit/autopsy/timeline/images/checker64.jpg
diff --git a/Timeline/src/org/sleuthkit/autopsy/advancedtimeline/images/checkerboard.png b/Timeline/src/org/sleuthkit/autopsy/timeline/images/checkerboard.png
similarity index 100%
rename from Timeline/src/org/sleuthkit/autopsy/advancedtimeline/images/checkerboard.png
rename to Timeline/src/org/sleuthkit/autopsy/timeline/images/checkerboard.png
diff --git a/Timeline/src/org/sleuthkit/autopsy/advancedtimeline/images/checkerboard_transparent.png b/Timeline/src/org/sleuthkit/autopsy/timeline/images/checkerboard_transparent.png
similarity index 100%
rename from Timeline/src/org/sleuthkit/autopsy/advancedtimeline/images/checkerboard_transparent.png
rename to Timeline/src/org/sleuthkit/autopsy/timeline/images/checkerboard_transparent.png
diff --git a/Timeline/src/org/sleuthkit/autopsy/advancedtimeline/images/clock-history.png b/Timeline/src/org/sleuthkit/autopsy/timeline/images/clock-history.png
similarity index 100%
rename from Timeline/src/org/sleuthkit/autopsy/advancedtimeline/images/clock-history.png
rename to Timeline/src/org/sleuthkit/autopsy/timeline/images/clock-history.png
diff --git a/Timeline/src/org/sleuthkit/autopsy/advancedtimeline/images/cookies.png b/Timeline/src/org/sleuthkit/autopsy/timeline/images/cookies.png
similarity index 100%
rename from Timeline/src/org/sleuthkit/autopsy/advancedtimeline/images/cookies.png
rename to Timeline/src/org/sleuthkit/autopsy/timeline/images/cookies.png
diff --git a/Timeline/src/org/sleuthkit/autopsy/advancedtimeline/images/cross-circle (2).png b/Timeline/src/org/sleuthkit/autopsy/timeline/images/cross-circle (2).png
similarity index 100%
rename from Timeline/src/org/sleuthkit/autopsy/advancedtimeline/images/cross-circle (2).png
rename to Timeline/src/org/sleuthkit/autopsy/timeline/images/cross-circle (2).png
diff --git a/Timeline/src/org/sleuthkit/autopsy/advancedtimeline/images/cross-circle.png b/Timeline/src/org/sleuthkit/autopsy/timeline/images/cross-circle.png
similarity index 100%
rename from Timeline/src/org/sleuthkit/autopsy/advancedtimeline/images/cross-circle.png
rename to Timeline/src/org/sleuthkit/autopsy/timeline/images/cross-circle.png
diff --git a/Timeline/src/org/sleuthkit/autopsy/advancedtimeline/images/downloads.png b/Timeline/src/org/sleuthkit/autopsy/timeline/images/downloads.png
similarity index 100%
rename from Timeline/src/org/sleuthkit/autopsy/advancedtimeline/images/downloads.png
rename to Timeline/src/org/sleuthkit/autopsy/timeline/images/downloads.png
diff --git a/Timeline/src/org/sleuthkit/autopsy/advancedtimeline/images/funnel--minus.png b/Timeline/src/org/sleuthkit/autopsy/timeline/images/funnel--minus.png
similarity index 100%
rename from Timeline/src/org/sleuthkit/autopsy/advancedtimeline/images/funnel--minus.png
rename to Timeline/src/org/sleuthkit/autopsy/timeline/images/funnel--minus.png
diff --git a/Timeline/src/org/sleuthkit/autopsy/advancedtimeline/images/funnel.png b/Timeline/src/org/sleuthkit/autopsy/timeline/images/funnel.png
similarity index 100%
rename from Timeline/src/org/sleuthkit/autopsy/advancedtimeline/images/funnel.png
rename to Timeline/src/org/sleuthkit/autopsy/timeline/images/funnel.png
diff --git a/Timeline/src/org/sleuthkit/autopsy/advancedtimeline/images/geolocation.png b/Timeline/src/org/sleuthkit/autopsy/timeline/images/geolocation.png
similarity index 100%
rename from Timeline/src/org/sleuthkit/autopsy/advancedtimeline/images/geolocation.png
rename to Timeline/src/org/sleuthkit/autopsy/timeline/images/geolocation.png
diff --git a/Timeline/src/org/sleuthkit/autopsy/advancedtimeline/images/gps-search.png b/Timeline/src/org/sleuthkit/autopsy/timeline/images/gps-search.png
similarity index 100%
rename from Timeline/src/org/sleuthkit/autopsy/advancedtimeline/images/gps-search.png
rename to Timeline/src/org/sleuthkit/autopsy/timeline/images/gps-search.png
diff --git a/Timeline/src/org/sleuthkit/autopsy/advancedtimeline/images/gps-trackpoint.png b/Timeline/src/org/sleuthkit/autopsy/timeline/images/gps-trackpoint.png
similarity index 100%
rename from Timeline/src/org/sleuthkit/autopsy/advancedtimeline/images/gps-trackpoint.png
rename to Timeline/src/org/sleuthkit/autopsy/timeline/images/gps-trackpoint.png
diff --git a/Timeline/src/org/sleuthkit/autopsy/advancedtimeline/images/history.png b/Timeline/src/org/sleuthkit/autopsy/timeline/images/history.png
similarity index 100%
rename from Timeline/src/org/sleuthkit/autopsy/advancedtimeline/images/history.png
rename to Timeline/src/org/sleuthkit/autopsy/timeline/images/history.png
diff --git a/Timeline/src/org/sleuthkit/autopsy/advancedtimeline/images/image.png b/Timeline/src/org/sleuthkit/autopsy/timeline/images/image.png
similarity index 100%
rename from Timeline/src/org/sleuthkit/autopsy/advancedtimeline/images/image.png
rename to Timeline/src/org/sleuthkit/autopsy/timeline/images/image.png
diff --git a/Timeline/src/org/sleuthkit/autopsy/advancedtimeline/images/info-icon-16.png b/Timeline/src/org/sleuthkit/autopsy/timeline/images/info-icon-16.png
similarity index 100%
rename from Timeline/src/org/sleuthkit/autopsy/advancedtimeline/images/info-icon-16.png
rename to Timeline/src/org/sleuthkit/autopsy/timeline/images/info-icon-16.png
diff --git a/Timeline/src/org/sleuthkit/autopsy/advancedtimeline/images/information.png b/Timeline/src/org/sleuthkit/autopsy/timeline/images/information.png
similarity index 100%
rename from Timeline/src/org/sleuthkit/autopsy/advancedtimeline/images/information.png
rename to Timeline/src/org/sleuthkit/autopsy/timeline/images/information.png
diff --git a/Timeline/src/org/sleuthkit/autopsy/advancedtimeline/images/magnifier-left.png b/Timeline/src/org/sleuthkit/autopsy/timeline/images/magnifier-left.png
similarity index 100%
rename from Timeline/src/org/sleuthkit/autopsy/advancedtimeline/images/magnifier-left.png
rename to Timeline/src/org/sleuthkit/autopsy/timeline/images/magnifier-left.png
diff --git a/Timeline/src/org/sleuthkit/autopsy/advancedtimeline/images/magnifier-zoom-actual-equal.png b/Timeline/src/org/sleuthkit/autopsy/timeline/images/magnifier-zoom-actual-equal.png
similarity index 100%
rename from Timeline/src/org/sleuthkit/autopsy/advancedtimeline/images/magnifier-zoom-actual-equal.png
rename to Timeline/src/org/sleuthkit/autopsy/timeline/images/magnifier-zoom-actual-equal.png
diff --git a/Timeline/src/org/sleuthkit/autopsy/advancedtimeline/images/magnifier-zoom-actual.png b/Timeline/src/org/sleuthkit/autopsy/timeline/images/magnifier-zoom-actual.png
similarity index 100%
rename from Timeline/src/org/sleuthkit/autopsy/advancedtimeline/images/magnifier-zoom-actual.png
rename to Timeline/src/org/sleuthkit/autopsy/timeline/images/magnifier-zoom-actual.png
diff --git a/Timeline/src/org/sleuthkit/autopsy/advancedtimeline/images/magnifier-zoom-fit.png b/Timeline/src/org/sleuthkit/autopsy/timeline/images/magnifier-zoom-fit.png
similarity index 100%
rename from Timeline/src/org/sleuthkit/autopsy/advancedtimeline/images/magnifier-zoom-fit.png
rename to Timeline/src/org/sleuthkit/autopsy/timeline/images/magnifier-zoom-fit.png
diff --git a/Timeline/src/org/sleuthkit/autopsy/advancedtimeline/images/magnifier-zoom-in-green.png b/Timeline/src/org/sleuthkit/autopsy/timeline/images/magnifier-zoom-in-green.png
similarity index 100%
rename from Timeline/src/org/sleuthkit/autopsy/advancedtimeline/images/magnifier-zoom-in-green.png
rename to Timeline/src/org/sleuthkit/autopsy/timeline/images/magnifier-zoom-in-green.png
diff --git a/Timeline/src/org/sleuthkit/autopsy/advancedtimeline/images/magnifier-zoom-in.png b/Timeline/src/org/sleuthkit/autopsy/timeline/images/magnifier-zoom-in.png
similarity index 100%
rename from Timeline/src/org/sleuthkit/autopsy/advancedtimeline/images/magnifier-zoom-in.png
rename to Timeline/src/org/sleuthkit/autopsy/timeline/images/magnifier-zoom-in.png
diff --git a/Timeline/src/org/sleuthkit/autopsy/advancedtimeline/images/magnifier-zoom-out-red.png b/Timeline/src/org/sleuthkit/autopsy/timeline/images/magnifier-zoom-out-red.png
similarity index 100%
rename from Timeline/src/org/sleuthkit/autopsy/advancedtimeline/images/magnifier-zoom-out-red.png
rename to Timeline/src/org/sleuthkit/autopsy/timeline/images/magnifier-zoom-out-red.png
diff --git a/Timeline/src/org/sleuthkit/autopsy/advancedtimeline/images/magnifier-zoom-out.png b/Timeline/src/org/sleuthkit/autopsy/timeline/images/magnifier-zoom-out.png
similarity index 100%
rename from Timeline/src/org/sleuthkit/autopsy/advancedtimeline/images/magnifier-zoom-out.png
rename to Timeline/src/org/sleuthkit/autopsy/timeline/images/magnifier-zoom-out.png
diff --git a/Timeline/src/org/sleuthkit/autopsy/advancedtimeline/images/magnifier-zoom.png b/Timeline/src/org/sleuthkit/autopsy/timeline/images/magnifier-zoom.png
similarity index 100%
rename from Timeline/src/org/sleuthkit/autopsy/advancedtimeline/images/magnifier-zoom.png
rename to Timeline/src/org/sleuthkit/autopsy/timeline/images/magnifier-zoom.png
diff --git a/Timeline/src/org/sleuthkit/autopsy/advancedtimeline/images/magnifier.png b/Timeline/src/org/sleuthkit/autopsy/timeline/images/magnifier.png
similarity index 100%
rename from Timeline/src/org/sleuthkit/autopsy/advancedtimeline/images/magnifier.png
rename to Timeline/src/org/sleuthkit/autopsy/timeline/images/magnifier.png
diff --git a/Timeline/src/org/sleuthkit/autopsy/advancedtimeline/images/magnifier_zoom_in.png b/Timeline/src/org/sleuthkit/autopsy/timeline/images/magnifier_zoom_in.png
similarity index 100%
rename from Timeline/src/org/sleuthkit/autopsy/advancedtimeline/images/magnifier_zoom_in.png
rename to Timeline/src/org/sleuthkit/autopsy/timeline/images/magnifier_zoom_in.png
diff --git a/Timeline/src/org/sleuthkit/autopsy/advancedtimeline/images/magnifier_zoom_out.png b/Timeline/src/org/sleuthkit/autopsy/timeline/images/magnifier_zoom_out.png
similarity index 100%
rename from Timeline/src/org/sleuthkit/autopsy/advancedtimeline/images/magnifier_zoom_out.png
rename to Timeline/src/org/sleuthkit/autopsy/timeline/images/magnifier_zoom_out.png
diff --git a/Timeline/src/org/sleuthkit/autopsy/advancedtimeline/images/mail-icon-16.png b/Timeline/src/org/sleuthkit/autopsy/timeline/images/mail-icon-16.png
similarity index 100%
rename from Timeline/src/org/sleuthkit/autopsy/advancedtimeline/images/mail-icon-16.png
rename to Timeline/src/org/sleuthkit/autopsy/timeline/images/mail-icon-16.png
diff --git a/Timeline/src/org/sleuthkit/autopsy/advancedtimeline/images/marker.png b/Timeline/src/org/sleuthkit/autopsy/timeline/images/marker.png
similarity index 100%
rename from Timeline/src/org/sleuthkit/autopsy/advancedtimeline/images/marker.png
rename to Timeline/src/org/sleuthkit/autopsy/timeline/images/marker.png
diff --git a/Timeline/src/org/sleuthkit/autopsy/advancedtimeline/images/message.png b/Timeline/src/org/sleuthkit/autopsy/timeline/images/message.png
similarity index 100%
rename from Timeline/src/org/sleuthkit/autopsy/advancedtimeline/images/message.png
rename to Timeline/src/org/sleuthkit/autopsy/timeline/images/message.png
diff --git a/Timeline/src/org/sleuthkit/autopsy/advancedtimeline/images/programs.png b/Timeline/src/org/sleuthkit/autopsy/timeline/images/programs.png
similarity index 100%
rename from Timeline/src/org/sleuthkit/autopsy/advancedtimeline/images/programs.png
rename to Timeline/src/org/sleuthkit/autopsy/timeline/images/programs.png
diff --git a/Timeline/src/org/sleuthkit/autopsy/advancedtimeline/images/prohibition.png b/Timeline/src/org/sleuthkit/autopsy/timeline/images/prohibition.png
similarity index 100%
rename from Timeline/src/org/sleuthkit/autopsy/advancedtimeline/images/prohibition.png
rename to Timeline/src/org/sleuthkit/autopsy/timeline/images/prohibition.png
diff --git a/Timeline/src/org/sleuthkit/autopsy/advancedtimeline/images/recent_docs.png b/Timeline/src/org/sleuthkit/autopsy/timeline/images/recent_docs.png
similarity index 100%
rename from Timeline/src/org/sleuthkit/autopsy/advancedtimeline/images/recent_docs.png
rename to Timeline/src/org/sleuthkit/autopsy/timeline/images/recent_docs.png
diff --git a/Timeline/src/org/sleuthkit/autopsy/advancedtimeline/images/searchquery.png b/Timeline/src/org/sleuthkit/autopsy/timeline/images/searchquery.png
similarity index 100%
rename from Timeline/src/org/sleuthkit/autopsy/advancedtimeline/images/searchquery.png
rename to Timeline/src/org/sleuthkit/autopsy/timeline/images/searchquery.png
diff --git a/Timeline/src/org/sleuthkit/autopsy/advancedtimeline/images/tick.png b/Timeline/src/org/sleuthkit/autopsy/timeline/images/tick.png
similarity index 100%
rename from Timeline/src/org/sleuthkit/autopsy/advancedtimeline/images/tick.png
rename to Timeline/src/org/sleuthkit/autopsy/timeline/images/tick.png
diff --git a/Timeline/src/org/sleuthkit/autopsy/advancedtimeline/images/timeline_marker.png b/Timeline/src/org/sleuthkit/autopsy/timeline/images/timeline_marker.png
similarity index 100%
rename from Timeline/src/org/sleuthkit/autopsy/advancedtimeline/images/timeline_marker.png
rename to Timeline/src/org/sleuthkit/autopsy/timeline/images/timeline_marker.png
diff --git a/Timeline/src/org/sleuthkit/autopsy/advancedtimeline/images/usb_devices.png b/Timeline/src/org/sleuthkit/autopsy/timeline/images/usb_devices.png
similarity index 100%
rename from Timeline/src/org/sleuthkit/autopsy/advancedtimeline/images/usb_devices.png
rename to Timeline/src/org/sleuthkit/autopsy/timeline/images/usb_devices.png
diff --git a/Timeline/src/org/sleuthkit/autopsy/advancedtimeline/images/web-file.png b/Timeline/src/org/sleuthkit/autopsy/timeline/images/web-file.png
similarity index 100%
rename from Timeline/src/org/sleuthkit/autopsy/advancedtimeline/images/web-file.png
rename to Timeline/src/org/sleuthkit/autopsy/timeline/images/web-file.png
diff --git a/Timeline/src/org/sleuthkit/autopsy/advancedtimeline/index.css b/Timeline/src/org/sleuthkit/autopsy/timeline/index.css
similarity index 100%
rename from Timeline/src/org/sleuthkit/autopsy/advancedtimeline/index.css
rename to Timeline/src/org/sleuthkit/autopsy/timeline/index.css
diff --git a/Timeline/src/org/sleuthkit/autopsy/advancedtimeline/license-advanced_timeline.txt b/Timeline/src/org/sleuthkit/autopsy/timeline/license-advanced_timeline.txt
similarity index 100%
rename from Timeline/src/org/sleuthkit/autopsy/advancedtimeline/license-advanced_timeline.txt
rename to Timeline/src/org/sleuthkit/autopsy/timeline/license-advanced_timeline.txt
diff --git a/Timeline/src/org/sleuthkit/autopsy/advancedtimeline/ui/AbstractVisualization.java b/Timeline/src/org/sleuthkit/autopsy/timeline/ui/AbstractVisualization.java
similarity index 98%
rename from Timeline/src/org/sleuthkit/autopsy/advancedtimeline/ui/AbstractVisualization.java
rename to Timeline/src/org/sleuthkit/autopsy/timeline/ui/AbstractVisualization.java
index e02cc632668afec67b68049127ae1075c582dee6..aabac6e1bb5b91e0c1410e490b063e2e4c932197 100644
--- a/Timeline/src/org/sleuthkit/autopsy/advancedtimeline/ui/AbstractVisualization.java
+++ b/Timeline/src/org/sleuthkit/autopsy/timeline/ui/AbstractVisualization.java
@@ -16,7 +16,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.sleuthkit.autopsy.advancedtimeline.ui;
+package org.sleuthkit.autopsy.timeline.ui;
 
 import java.util.List;
 import java.util.concurrent.ExecutionException;
@@ -50,9 +50,9 @@
 import javax.annotation.concurrent.Immutable;
 import org.apache.commons.lang3.StringUtils;
 import org.openide.util.Exceptions;
-import org.sleuthkit.autopsy.advancedtimeline.TimeLineController;
-import org.sleuthkit.autopsy.advancedtimeline.TimeLineView;
-import org.sleuthkit.autopsy.advancedtimeline.events.FilteredEventsModel;
+import org.sleuthkit.autopsy.timeline.TimeLineController;
+import org.sleuthkit.autopsy.timeline.TimeLineView;
+import org.sleuthkit.autopsy.timeline.events.FilteredEventsModel;
 
 /** Abstract base class for {@link Chart} based {@link TimeLineView}s used in
  * the main visualization area.
diff --git a/Timeline/src/org/sleuthkit/autopsy/advancedtimeline/ui/Bundle.properties b/Timeline/src/org/sleuthkit/autopsy/timeline/ui/Bundle.properties
similarity index 100%
rename from Timeline/src/org/sleuthkit/autopsy/advancedtimeline/ui/Bundle.properties
rename to Timeline/src/org/sleuthkit/autopsy/timeline/ui/Bundle.properties
diff --git a/Timeline/src/org/sleuthkit/autopsy/advancedtimeline/ui/NoEventsDialog.fxml b/Timeline/src/org/sleuthkit/autopsy/timeline/ui/NoEventsDialog.fxml
similarity index 100%
rename from Timeline/src/org/sleuthkit/autopsy/advancedtimeline/ui/NoEventsDialog.fxml
rename to Timeline/src/org/sleuthkit/autopsy/timeline/ui/NoEventsDialog.fxml
diff --git a/Timeline/src/org/sleuthkit/autopsy/advancedtimeline/ui/StatusBar.fxml b/Timeline/src/org/sleuthkit/autopsy/timeline/ui/StatusBar.fxml
similarity index 100%
rename from Timeline/src/org/sleuthkit/autopsy/advancedtimeline/ui/StatusBar.fxml
rename to Timeline/src/org/sleuthkit/autopsy/timeline/ui/StatusBar.fxml
diff --git a/Timeline/src/org/sleuthkit/autopsy/advancedtimeline/ui/StatusBar.java b/Timeline/src/org/sleuthkit/autopsy/timeline/ui/StatusBar.java
similarity index 91%
rename from Timeline/src/org/sleuthkit/autopsy/advancedtimeline/ui/StatusBar.java
rename to Timeline/src/org/sleuthkit/autopsy/timeline/ui/StatusBar.java
index d83bb45489d193edc4ada92abaf3ecf1768ff484..0a80d3146dc91ee7e15f010fd31fadc067815084 100644
--- a/Timeline/src/org/sleuthkit/autopsy/advancedtimeline/ui/StatusBar.java
+++ b/Timeline/src/org/sleuthkit/autopsy/timeline/ui/StatusBar.java
@@ -16,7 +16,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.sleuthkit.autopsy.advancedtimeline.ui;
+package org.sleuthkit.autopsy.timeline.ui;
 
 import javafx.fxml.FXML;
 import javafx.scene.control.Label;
@@ -25,9 +25,9 @@
 import javafx.scene.layout.HBox;
 import javafx.scene.layout.Priority;
 import javafx.scene.layout.Region;
-import org.sleuthkit.autopsy.advancedtimeline.FXMLConstructor;
-import org.sleuthkit.autopsy.advancedtimeline.TimeLineController;
-import org.sleuthkit.autopsy.advancedtimeline.TimeLineUI;
+import org.sleuthkit.autopsy.timeline.FXMLConstructor;
+import org.sleuthkit.autopsy.timeline.TimeLineController;
+import org.sleuthkit.autopsy.timeline.TimeLineUI;
 
 /**
  * simple status bar that only shows one possible message determined by
diff --git a/Timeline/src/org/sleuthkit/autopsy/advancedtimeline/ui/TimeLineChart.java b/Timeline/src/org/sleuthkit/autopsy/timeline/ui/TimeLineChart.java
similarity index 98%
rename from Timeline/src/org/sleuthkit/autopsy/advancedtimeline/ui/TimeLineChart.java
rename to Timeline/src/org/sleuthkit/autopsy/timeline/ui/TimeLineChart.java
index 9164cf898a2725f262dad16be20c4841b0a9a227..70e76b2fe017b61bf96fbcd60c2e629383b142e9 100644
--- a/Timeline/src/org/sleuthkit/autopsy/advancedtimeline/ui/TimeLineChart.java
+++ b/Timeline/src/org/sleuthkit/autopsy/timeline/ui/TimeLineChart.java
@@ -16,7 +16,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.sleuthkit.autopsy.advancedtimeline.ui;
+package org.sleuthkit.autopsy.timeline.ui;
 
 import javafx.event.EventHandler;
 import javafx.geometry.Point2D;
@@ -30,8 +30,8 @@
 import javafx.scene.shape.Rectangle;
 import org.joda.time.DateTime;
 import org.joda.time.Interval;
-import org.sleuthkit.autopsy.advancedtimeline.TimeLineController;
-import org.sleuthkit.autopsy.advancedtimeline.TimeLineView;
+import org.sleuthkit.autopsy.timeline.TimeLineController;
+import org.sleuthkit.autopsy.timeline.TimeLineView;
 
 /** Interface for TimeLineViews that are 'charts'.
  *
diff --git a/Timeline/src/org/sleuthkit/autopsy/advancedtimeline/ui/TimeLineResultView.java b/Timeline/src/org/sleuthkit/autopsy/timeline/ui/TimeLineResultView.java
similarity index 92%
rename from Timeline/src/org/sleuthkit/autopsy/advancedtimeline/ui/TimeLineResultView.java
rename to Timeline/src/org/sleuthkit/autopsy/timeline/ui/TimeLineResultView.java
index 5d63da5ab31b893a8f42d24349f37ae7dbc15bdd..2700f86aace31cf9ba4b563c693bda4ba3a1fd39 100644
--- a/Timeline/src/org/sleuthkit/autopsy/advancedtimeline/ui/TimeLineResultView.java
+++ b/Timeline/src/org/sleuthkit/autopsy/timeline/ui/TimeLineResultView.java
@@ -16,7 +16,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.sleuthkit.autopsy.advancedtimeline.ui;
+package org.sleuthkit.autopsy.timeline.ui;
 
 import java.util.HashSet;
 import java.util.Set;
@@ -25,10 +25,10 @@
 import org.joda.time.format.DateTimeFormatter;
 import org.openide.nodes.Node;
 import org.openide.util.NbBundle;
-import org.sleuthkit.autopsy.advancedtimeline.TimeLineController;
-import org.sleuthkit.autopsy.advancedtimeline.TimeLineView;
-import org.sleuthkit.autopsy.advancedtimeline.events.FilteredEventsModel;
-import org.sleuthkit.autopsy.advancedtimeline.explorernodes.EventRootNode;
+import org.sleuthkit.autopsy.timeline.TimeLineController;
+import org.sleuthkit.autopsy.timeline.TimeLineView;
+import org.sleuthkit.autopsy.timeline.events.FilteredEventsModel;
+import org.sleuthkit.autopsy.timeline.explorernodes.EventRootNode;
 import org.sleuthkit.autopsy.corecomponentinterfaces.DataContent;
 import org.sleuthkit.autopsy.corecomponents.DataResultPanel;
 
diff --git a/Timeline/src/org/sleuthkit/autopsy/advancedtimeline/ui/TimeZonePanel.fxml b/Timeline/src/org/sleuthkit/autopsy/timeline/ui/TimeZonePanel.fxml
similarity index 100%
rename from Timeline/src/org/sleuthkit/autopsy/advancedtimeline/ui/TimeZonePanel.fxml
rename to Timeline/src/org/sleuthkit/autopsy/timeline/ui/TimeZonePanel.fxml
diff --git a/Timeline/src/org/sleuthkit/autopsy/advancedtimeline/ui/TimeZonePanel.java b/Timeline/src/org/sleuthkit/autopsy/timeline/ui/TimeZonePanel.java
similarity index 92%
rename from Timeline/src/org/sleuthkit/autopsy/advancedtimeline/ui/TimeZonePanel.java
rename to Timeline/src/org/sleuthkit/autopsy/timeline/ui/TimeZonePanel.java
index 325021fe17045753ace385a7531f34896ba5a607..6882781b64d57acc0a728bd7cbd87cc7b1b0e3f9 100644
--- a/Timeline/src/org/sleuthkit/autopsy/advancedtimeline/ui/TimeZonePanel.java
+++ b/Timeline/src/org/sleuthkit/autopsy/timeline/ui/TimeZonePanel.java
@@ -16,7 +16,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.sleuthkit.autopsy.advancedtimeline.ui;
+package org.sleuthkit.autopsy.timeline.ui;
 
 import java.time.ZoneOffset;
 import java.util.Date;
@@ -27,8 +27,8 @@
 import javafx.scene.control.TitledPane;
 import javafx.scene.control.Toggle;
 import javafx.scene.control.ToggleGroup;
-import org.sleuthkit.autopsy.advancedtimeline.FXMLConstructor;
-import org.sleuthkit.autopsy.advancedtimeline.TimeLineController;
+import org.sleuthkit.autopsy.timeline.FXMLConstructor;
+import org.sleuthkit.autopsy.timeline.TimeLineController;
 
 /**
  * FXML Controller class for timezone picker ui
diff --git a/Timeline/src/org/sleuthkit/autopsy/advancedtimeline/ui/VisualizationPanel.fxml b/Timeline/src/org/sleuthkit/autopsy/timeline/ui/VisualizationPanel.fxml
similarity index 100%
rename from Timeline/src/org/sleuthkit/autopsy/advancedtimeline/ui/VisualizationPanel.fxml
rename to Timeline/src/org/sleuthkit/autopsy/timeline/ui/VisualizationPanel.fxml
diff --git a/Timeline/src/org/sleuthkit/autopsy/advancedtimeline/ui/VisualizationPanel.java b/Timeline/src/org/sleuthkit/autopsy/timeline/ui/VisualizationPanel.java
similarity index 95%
rename from Timeline/src/org/sleuthkit/autopsy/advancedtimeline/ui/VisualizationPanel.java
rename to Timeline/src/org/sleuthkit/autopsy/timeline/ui/VisualizationPanel.java
index f1ccfe76f3baede273e6b9b17e9a0efab8674859..e13f7624a12c198390631a45f8edfdbeb203b9e7 100644
--- a/Timeline/src/org/sleuthkit/autopsy/advancedtimeline/ui/VisualizationPanel.java
+++ b/Timeline/src/org/sleuthkit/autopsy/timeline/ui/VisualizationPanel.java
@@ -16,7 +16,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.sleuthkit.autopsy.advancedtimeline.ui;
+package org.sleuthkit.autopsy.timeline.ui;
 
 import impl.org.controlsfx.skin.RangeSliderSkin;
 import java.net.URL;
@@ -67,20 +67,20 @@
 import org.joda.time.DateTime;
 import org.joda.time.DateTimeZone;
 import org.joda.time.Interval;
-import org.sleuthkit.autopsy.advancedtimeline.FXMLConstructor;
-import org.sleuthkit.autopsy.advancedtimeline.LoggedTask;
-import org.sleuthkit.autopsy.advancedtimeline.TimeLineController;
-import org.sleuthkit.autopsy.advancedtimeline.TimeLineView;
-import org.sleuthkit.autopsy.advancedtimeline.VisualizationMode;
-import org.sleuthkit.autopsy.advancedtimeline.actions.DefaultFilters;
-import org.sleuthkit.autopsy.advancedtimeline.actions.SaveSnapshot;
-import org.sleuthkit.autopsy.advancedtimeline.actions.ZoomOut;
-import org.sleuthkit.autopsy.advancedtimeline.events.FilteredEventsModel;
-import org.sleuthkit.autopsy.advancedtimeline.ui.countsview.CountsViewPane;
-import org.sleuthkit.autopsy.advancedtimeline.ui.detailview.DetailViewPane;
-import org.sleuthkit.autopsy.advancedtimeline.ui.detailview.tree.NavPanel;
-import org.sleuthkit.autopsy.advancedtimeline.utils.RangeDivisionInfo;
 import org.sleuthkit.autopsy.coreutils.Logger;
+import org.sleuthkit.autopsy.timeline.FXMLConstructor;
+import org.sleuthkit.autopsy.timeline.LoggedTask;
+import org.sleuthkit.autopsy.timeline.TimeLineController;
+import org.sleuthkit.autopsy.timeline.TimeLineView;
+import org.sleuthkit.autopsy.timeline.VisualizationMode;
+import org.sleuthkit.autopsy.timeline.actions.DefaultFilters;
+import org.sleuthkit.autopsy.timeline.actions.SaveSnapshot;
+import org.sleuthkit.autopsy.timeline.actions.ZoomOut;
+import org.sleuthkit.autopsy.timeline.events.FilteredEventsModel;
+import org.sleuthkit.autopsy.timeline.ui.countsview.CountsViewPane;
+import org.sleuthkit.autopsy.timeline.ui.detailview.DetailViewPane;
+import org.sleuthkit.autopsy.timeline.ui.detailview.tree.NavPanel;
+import org.sleuthkit.autopsy.timeline.utils.RangeDivisionInfo;
 
 /** A Container for an {@link AbstractVisualization}, has a toolbar on top to
  * hold settings widgets supplied by contained {@link AbstractVisualization},
@@ -98,7 +98,7 @@ public class VisualizationPanel extends BorderPane implements TimeLineView {
 
     private final NavPanel navPanel;
 
-    private AbstractVisualization visualization;
+    private AbstractVisualization<?, ?, ?, ?> visualization;
 
     @FXML // ResourceBundle that was given to the FXMLLoader
     private ResourceBundle resources;
@@ -378,7 +378,7 @@ private void setViewMode(VisualizationMode visualizationMode) {
         }
     }
 
-    synchronized void setVisualization(final AbstractVisualization newViz) {
+    synchronized void setVisualization(final AbstractVisualization<?, ?, ?, ?> newViz) {
         Platform.runLater(() -> {
             synchronized (VisualizationPanel.this) {
                 if (visualization != null) {
diff --git a/Timeline/src/org/sleuthkit/autopsy/advancedtimeline/ui/ZoomRanges.java b/Timeline/src/org/sleuthkit/autopsy/timeline/ui/ZoomRanges.java
similarity index 96%
rename from Timeline/src/org/sleuthkit/autopsy/advancedtimeline/ui/ZoomRanges.java
rename to Timeline/src/org/sleuthkit/autopsy/timeline/ui/ZoomRanges.java
index 201a4b09adebd6455c7fe72de47979474182a25d..30b9f2fd1bfe47698455860e5c663b7bf7331fe6 100644
--- a/Timeline/src/org/sleuthkit/autopsy/advancedtimeline/ui/ZoomRanges.java
+++ b/Timeline/src/org/sleuthkit/autopsy/timeline/ui/ZoomRanges.java
@@ -1,4 +1,4 @@
-package org.sleuthkit.autopsy.advancedtimeline.ui;
+package org.sleuthkit.autopsy.timeline.ui;
 
 import org.joda.time.Days;
 import org.joda.time.Hours;
diff --git a/Timeline/src/org/sleuthkit/autopsy/advancedtimeline/ui/countsview/Bundle.properties b/Timeline/src/org/sleuthkit/autopsy/timeline/ui/countsview/Bundle.properties
similarity index 100%
rename from Timeline/src/org/sleuthkit/autopsy/advancedtimeline/ui/countsview/Bundle.properties
rename to Timeline/src/org/sleuthkit/autopsy/timeline/ui/countsview/Bundle.properties
diff --git a/Timeline/src/org/sleuthkit/autopsy/advancedtimeline/ui/countsview/CountsViewPane.java b/Timeline/src/org/sleuthkit/autopsy/timeline/ui/countsview/CountsViewPane.java
similarity index 96%
rename from Timeline/src/org/sleuthkit/autopsy/advancedtimeline/ui/countsview/CountsViewPane.java
rename to Timeline/src/org/sleuthkit/autopsy/timeline/ui/countsview/CountsViewPane.java
index f5679314c6e1b8f2e8eb7b4d0856f7bf83f9f259..5d9f60120272b7d521f0cc2250d7e0058c21da0f 100644
--- a/Timeline/src/org/sleuthkit/autopsy/advancedtimeline/ui/countsview/CountsViewPane.java
+++ b/Timeline/src/org/sleuthkit/autopsy/timeline/ui/countsview/CountsViewPane.java
@@ -16,7 +16,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.sleuthkit.autopsy.advancedtimeline.ui.countsview;
+package org.sleuthkit.autopsy.timeline.ui.countsview;
 
 import java.net.URL;
 import java.util.ArrayList;
@@ -60,18 +60,18 @@
 import org.joda.time.DateTime;
 import org.joda.time.Interval;
 import org.joda.time.Seconds;
-import org.sleuthkit.autopsy.advancedtimeline.FXMLConstructor;
-import org.sleuthkit.autopsy.advancedtimeline.LoggedTask;
-import org.sleuthkit.autopsy.advancedtimeline.TimeLineController;
-import org.sleuthkit.autopsy.advancedtimeline.TimeLineView;
-import org.sleuthkit.autopsy.advancedtimeline.actions.Back;
-import org.sleuthkit.autopsy.advancedtimeline.actions.Forward;
-import org.sleuthkit.autopsy.advancedtimeline.events.FilteredEventsModel;
-import org.sleuthkit.autopsy.advancedtimeline.events.type.EventType;
-import org.sleuthkit.autopsy.advancedtimeline.events.type.RootEventType;
-import org.sleuthkit.autopsy.advancedtimeline.ui.AbstractVisualization;
-import org.sleuthkit.autopsy.advancedtimeline.utils.ColorUtilities;
-import org.sleuthkit.autopsy.advancedtimeline.utils.RangeDivisionInfo;
+import org.sleuthkit.autopsy.timeline.FXMLConstructor;
+import org.sleuthkit.autopsy.timeline.LoggedTask;
+import org.sleuthkit.autopsy.timeline.TimeLineController;
+import org.sleuthkit.autopsy.timeline.TimeLineView;
+import org.sleuthkit.autopsy.timeline.actions.Back;
+import org.sleuthkit.autopsy.timeline.actions.Forward;
+import org.sleuthkit.autopsy.timeline.events.FilteredEventsModel;
+import org.sleuthkit.autopsy.timeline.events.type.EventType;
+import org.sleuthkit.autopsy.timeline.events.type.RootEventType;
+import org.sleuthkit.autopsy.timeline.ui.AbstractVisualization;
+import org.sleuthkit.autopsy.timeline.utils.ColorUtilities;
+import org.sleuthkit.autopsy.timeline.utils.RangeDivisionInfo;
 import org.sleuthkit.autopsy.coreutils.Logger;
 
 /**
diff --git a/Timeline/src/org/sleuthkit/autopsy/advancedtimeline/ui/countsview/CountsViewSettingsPane.fxml b/Timeline/src/org/sleuthkit/autopsy/timeline/ui/countsview/CountsViewSettingsPane.fxml
similarity index 100%
rename from Timeline/src/org/sleuthkit/autopsy/advancedtimeline/ui/countsview/CountsViewSettingsPane.fxml
rename to Timeline/src/org/sleuthkit/autopsy/timeline/ui/countsview/CountsViewSettingsPane.fxml
diff --git a/Timeline/src/org/sleuthkit/autopsy/advancedtimeline/ui/countsview/EventCountsChart.java b/Timeline/src/org/sleuthkit/autopsy/timeline/ui/countsview/EventCountsChart.java
similarity index 93%
rename from Timeline/src/org/sleuthkit/autopsy/advancedtimeline/ui/countsview/EventCountsChart.java
rename to Timeline/src/org/sleuthkit/autopsy/timeline/ui/countsview/EventCountsChart.java
index ea88bd725fcc29c92a5f8d74542dc29afaa0a6b2..4ee393cdf4fb8ce58736add83a546dc6a28a4de3 100644
--- a/Timeline/src/org/sleuthkit/autopsy/advancedtimeline/ui/countsview/EventCountsChart.java
+++ b/Timeline/src/org/sleuthkit/autopsy/timeline/ui/countsview/EventCountsChart.java
@@ -16,7 +16,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.sleuthkit.autopsy.advancedtimeline.ui.countsview;
+package org.sleuthkit.autopsy.timeline.ui.countsview;
 
 import java.util.Arrays;
 import java.util.Collections;
@@ -33,12 +33,12 @@
 import org.joda.time.DateTime;
 import org.joda.time.Interval;
 import org.openide.util.NbBundle;
-import org.sleuthkit.autopsy.advancedtimeline.TimeLineController;
-import org.sleuthkit.autopsy.advancedtimeline.actions.Back;
-import org.sleuthkit.autopsy.advancedtimeline.actions.Forward;
-import org.sleuthkit.autopsy.advancedtimeline.events.FilteredEventsModel;
-import org.sleuthkit.autopsy.advancedtimeline.ui.TimeLineChart;
-import org.sleuthkit.autopsy.advancedtimeline.utils.RangeDivisionInfo;
+import org.sleuthkit.autopsy.timeline.TimeLineController;
+import org.sleuthkit.autopsy.timeline.actions.Back;
+import org.sleuthkit.autopsy.timeline.actions.Forward;
+import org.sleuthkit.autopsy.timeline.events.FilteredEventsModel;
+import org.sleuthkit.autopsy.timeline.ui.TimeLineChart;
+import org.sleuthkit.autopsy.timeline.utils.RangeDivisionInfo;
 
 /** Customized {@link StackedBarChart<String, Number>} used to display the event
  * counts in {@link CountsViewPane} */
diff --git a/Timeline/src/org/sleuthkit/autopsy/advancedtimeline/ui/detailview/AggregateEventNode.java b/Timeline/src/org/sleuthkit/autopsy/timeline/ui/detailview/AggregateEventNode.java
similarity index 97%
rename from Timeline/src/org/sleuthkit/autopsy/advancedtimeline/ui/detailview/AggregateEventNode.java
rename to Timeline/src/org/sleuthkit/autopsy/timeline/ui/detailview/AggregateEventNode.java
index caf18b6430fa32e791f8d40f3271d0a2eaf61a74..edcb8ef407fb2b8b9416fcc828277a199276b681 100644
--- a/Timeline/src/org/sleuthkit/autopsy/advancedtimeline/ui/detailview/AggregateEventNode.java
+++ b/Timeline/src/org/sleuthkit/autopsy/timeline/ui/detailview/AggregateEventNode.java
@@ -16,9 +16,9 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.sleuthkit.autopsy.advancedtimeline.ui.detailview;
+package org.sleuthkit.autopsy.timeline.ui.detailview;
 
-import org.sleuthkit.autopsy.advancedtimeline.events.AggregateEvent;
+import org.sleuthkit.autopsy.timeline.events.AggregateEvent;
 import javafx.application.Platform;
 import javafx.beans.property.SimpleObjectProperty;
 import javafx.geometry.Insets;
@@ -42,8 +42,8 @@
 import javafx.scene.layout.Region;
 import javafx.scene.layout.StackPane;
 import javafx.scene.paint.Color;
-import org.sleuthkit.autopsy.advancedtimeline.TimeLineController;
-import org.sleuthkit.autopsy.advancedtimeline.utils.ColorUtilities;
+import org.sleuthkit.autopsy.timeline.TimeLineController;
+import org.sleuthkit.autopsy.timeline.utils.ColorUtilities;
 
 /** Represents an {@link AggregateEvent} in a {@link EventDetailChart}. */
 public class AggregateEventNode extends StackPane {
diff --git a/Timeline/src/org/sleuthkit/autopsy/advancedtimeline/ui/detailview/DateAxis.java b/Timeline/src/org/sleuthkit/autopsy/timeline/ui/detailview/DateAxis.java
similarity index 98%
rename from Timeline/src/org/sleuthkit/autopsy/advancedtimeline/ui/detailview/DateAxis.java
rename to Timeline/src/org/sleuthkit/autopsy/timeline/ui/detailview/DateAxis.java
index ae92873f141c0c53add96be9ec11bba1494dee56..df9092c794ad115ba053e65045bebc664bddb180 100644
--- a/Timeline/src/org/sleuthkit/autopsy/advancedtimeline/ui/detailview/DateAxis.java
+++ b/Timeline/src/org/sleuthkit/autopsy/timeline/ui/detailview/DateAxis.java
@@ -24,7 +24,7 @@
  * 
  * 
  */
-package org.sleuthkit.autopsy.advancedtimeline.ui.detailview;
+package org.sleuthkit.autopsy.timeline.ui.detailview;
 
 import java.util.ArrayList;
 import java.util.Collections;
@@ -36,8 +36,8 @@
 import javafx.scene.chart.Axis;
 import org.joda.time.DateTime;
 import org.joda.time.Interval;
-import org.sleuthkit.autopsy.advancedtimeline.TimeLineController;
-import org.sleuthkit.autopsy.advancedtimeline.utils.RangeDivisionInfo;
+import org.sleuthkit.autopsy.timeline.TimeLineController;
+import org.sleuthkit.autopsy.timeline.utils.RangeDivisionInfo;
 
 /**
  * from <a
diff --git a/Timeline/src/org/sleuthkit/autopsy/advancedtimeline/ui/detailview/DescriptionVisibility.java b/Timeline/src/org/sleuthkit/autopsy/timeline/ui/detailview/DescriptionVisibility.java
similarity index 93%
rename from Timeline/src/org/sleuthkit/autopsy/advancedtimeline/ui/detailview/DescriptionVisibility.java
rename to Timeline/src/org/sleuthkit/autopsy/timeline/ui/detailview/DescriptionVisibility.java
index beed38962694c71c5eb3d6de6d871d331451c8b9..e398c68070a42f72858d2484d3c1e84e4f778b9e 100644
--- a/Timeline/src/org/sleuthkit/autopsy/advancedtimeline/ui/detailview/DescriptionVisibility.java
+++ b/Timeline/src/org/sleuthkit/autopsy/timeline/ui/detailview/DescriptionVisibility.java
@@ -16,7 +16,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.sleuthkit.autopsy.advancedtimeline.ui.detailview;
+package org.sleuthkit.autopsy.timeline.ui.detailview;
 
 /** Level of description shown in UI
  * NOTE: this is a separate concept form {@link DescriptionLOD} */
diff --git a/Timeline/src/org/sleuthkit/autopsy/advancedtimeline/ui/detailview/DetailViewPane.java b/Timeline/src/org/sleuthkit/autopsy/timeline/ui/detailview/DetailViewPane.java
similarity index 95%
rename from Timeline/src/org/sleuthkit/autopsy/advancedtimeline/ui/detailview/DetailViewPane.java
rename to Timeline/src/org/sleuthkit/autopsy/timeline/ui/detailview/DetailViewPane.java
index 63013c72bbab3a57369eab2795b24620fb4bf55e..3eceb5d9197874a0e607f4562ccb192674a67997 100644
--- a/Timeline/src/org/sleuthkit/autopsy/advancedtimeline/ui/detailview/DetailViewPane.java
+++ b/Timeline/src/org/sleuthkit/autopsy/timeline/ui/detailview/DetailViewPane.java
@@ -16,7 +16,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.sleuthkit.autopsy.advancedtimeline.ui.detailview;
+package org.sleuthkit.autopsy.timeline.ui.detailview;
 
 import java.net.URL;
 import java.util.ArrayList;
@@ -60,16 +60,16 @@
 import javafx.scene.layout.Region;
 import javafx.scene.layout.VBox;
 import org.joda.time.DateTime;
-import org.sleuthkit.autopsy.advancedtimeline.FXMLConstructor;
-import org.sleuthkit.autopsy.advancedtimeline.LoggedTask;
-import org.sleuthkit.autopsy.advancedtimeline.TimeLineController;
-import org.sleuthkit.autopsy.advancedtimeline.events.AggregateEvent;
-import org.sleuthkit.autopsy.advancedtimeline.events.FilteredEventsModel;
-import org.sleuthkit.autopsy.advancedtimeline.events.type.EventType;
-import org.sleuthkit.autopsy.advancedtimeline.ui.AbstractVisualization;
-import org.sleuthkit.autopsy.advancedtimeline.ui.countsview.CountsViewPane;
-import org.sleuthkit.autopsy.advancedtimeline.ui.detailview.tree.NavTreeNode;
-import org.sleuthkit.autopsy.advancedtimeline.utils.RangeDivisionInfo;
+import org.sleuthkit.autopsy.timeline.FXMLConstructor;
+import org.sleuthkit.autopsy.timeline.LoggedTask;
+import org.sleuthkit.autopsy.timeline.TimeLineController;
+import org.sleuthkit.autopsy.timeline.events.AggregateEvent;
+import org.sleuthkit.autopsy.timeline.events.FilteredEventsModel;
+import org.sleuthkit.autopsy.timeline.events.type.EventType;
+import org.sleuthkit.autopsy.timeline.ui.AbstractVisualization;
+import org.sleuthkit.autopsy.timeline.ui.countsview.CountsViewPane;
+import org.sleuthkit.autopsy.timeline.ui.detailview.tree.NavTreeNode;
+import org.sleuthkit.autopsy.timeline.utils.RangeDivisionInfo;
 import org.sleuthkit.autopsy.coreutils.Logger;
 
 /**
diff --git a/Timeline/src/org/sleuthkit/autopsy/advancedtimeline/ui/detailview/DetailViewSettingsPane.fxml b/Timeline/src/org/sleuthkit/autopsy/timeline/ui/detailview/DetailViewSettingsPane.fxml
similarity index 100%
rename from Timeline/src/org/sleuthkit/autopsy/advancedtimeline/ui/detailview/DetailViewSettingsPane.fxml
rename to Timeline/src/org/sleuthkit/autopsy/timeline/ui/detailview/DetailViewSettingsPane.fxml
diff --git a/Timeline/src/org/sleuthkit/autopsy/advancedtimeline/ui/detailview/EventAxis.java b/Timeline/src/org/sleuthkit/autopsy/timeline/ui/detailview/EventAxis.java
similarity index 95%
rename from Timeline/src/org/sleuthkit/autopsy/advancedtimeline/ui/detailview/EventAxis.java
rename to Timeline/src/org/sleuthkit/autopsy/timeline/ui/detailview/EventAxis.java
index 26db7cf50c50091a4b6d0ea9d196b769f23d8986..78235664c6e9808a752f4f1e682dbebcefe5ddec 100644
--- a/Timeline/src/org/sleuthkit/autopsy/advancedtimeline/ui/detailview/EventAxis.java
+++ b/Timeline/src/org/sleuthkit/autopsy/timeline/ui/detailview/EventAxis.java
@@ -16,13 +16,13 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.sleuthkit.autopsy.advancedtimeline.ui.detailview;
+package org.sleuthkit.autopsy.timeline.ui.detailview;
 
 import java.util.Collections;
 import java.util.List;
 import javafx.scene.chart.Axis;
 import javafx.scene.chart.XYChart;
-import org.sleuthkit.autopsy.advancedtimeline.events.AggregateEvent;
+import org.sleuthkit.autopsy.timeline.events.AggregateEvent;
 
 /** No-Op axis that doesn't do anything usefull but is necessary to pass
  * AggregateEvent as the second member of {@link XYChart.Data} objects */
diff --git a/Timeline/src/org/sleuthkit/autopsy/advancedtimeline/ui/detailview/EventDetailChart.java b/Timeline/src/org/sleuthkit/autopsy/timeline/ui/detailview/EventDetailChart.java
similarity index 97%
rename from Timeline/src/org/sleuthkit/autopsy/advancedtimeline/ui/detailview/EventDetailChart.java
rename to Timeline/src/org/sleuthkit/autopsy/timeline/ui/detailview/EventDetailChart.java
index 0c67d1bd091b28fe2128e43313b690db1fadda26..a999094d6069ff5b610e4127e129d3fb593b6496 100644
--- a/Timeline/src/org/sleuthkit/autopsy/advancedtimeline/ui/detailview/EventDetailChart.java
+++ b/Timeline/src/org/sleuthkit/autopsy/timeline/ui/detailview/EventDetailChart.java
@@ -16,7 +16,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.sleuthkit.autopsy.advancedtimeline.ui.detailview;
+package org.sleuthkit.autopsy.timeline.ui.detailview;
 
 import com.google.common.collect.Collections2;
 import java.util.ArrayList;
@@ -76,19 +76,19 @@
 import org.joda.time.DateTime;
 import org.joda.time.Interval;
 import org.openide.util.Exceptions;
-import org.sleuthkit.autopsy.advancedtimeline.LoggedTask;
-import org.sleuthkit.autopsy.advancedtimeline.TimeLineController;
-import org.sleuthkit.autopsy.advancedtimeline.actions.Back;
-import org.sleuthkit.autopsy.advancedtimeline.actions.Forward;
-import org.sleuthkit.autopsy.advancedtimeline.events.AggregateEvent;
-import org.sleuthkit.autopsy.advancedtimeline.events.FilteredEventsModel;
-import org.sleuthkit.autopsy.advancedtimeline.events.type.EventType;
-import org.sleuthkit.autopsy.advancedtimeline.filters.Filter;
-import org.sleuthkit.autopsy.advancedtimeline.filters.TextFilter;
-import org.sleuthkit.autopsy.advancedtimeline.filters.TypeFilter;
-import org.sleuthkit.autopsy.advancedtimeline.ui.TimeLineChart;
-import org.sleuthkit.autopsy.advancedtimeline.zooming.DescriptionLOD;
-import org.sleuthkit.autopsy.advancedtimeline.zooming.ZoomParams;
+import org.sleuthkit.autopsy.timeline.LoggedTask;
+import org.sleuthkit.autopsy.timeline.TimeLineController;
+import org.sleuthkit.autopsy.timeline.actions.Back;
+import org.sleuthkit.autopsy.timeline.actions.Forward;
+import org.sleuthkit.autopsy.timeline.events.AggregateEvent;
+import org.sleuthkit.autopsy.timeline.events.FilteredEventsModel;
+import org.sleuthkit.autopsy.timeline.events.type.EventType;
+import org.sleuthkit.autopsy.timeline.filters.Filter;
+import org.sleuthkit.autopsy.timeline.filters.TextFilter;
+import org.sleuthkit.autopsy.timeline.filters.TypeFilter;
+import org.sleuthkit.autopsy.timeline.ui.TimeLineChart;
+import org.sleuthkit.autopsy.timeline.zooming.DescriptionLOD;
+import org.sleuthkit.autopsy.timeline.zooming.ZoomParams;
 
 /**
  * Custom implementation of {@link XYChart} to graph events on a horizontal
diff --git a/Timeline/src/org/sleuthkit/autopsy/advancedtimeline/ui/detailview/GuideLine.java b/Timeline/src/org/sleuthkit/autopsy/timeline/ui/detailview/GuideLine.java
similarity index 94%
rename from Timeline/src/org/sleuthkit/autopsy/advancedtimeline/ui/detailview/GuideLine.java
rename to Timeline/src/org/sleuthkit/autopsy/timeline/ui/detailview/GuideLine.java
index 4a3d2a31cd8b501e7572794973634d980703d4e1..febf055aada0cd8468682df3207396a5807d1a9c 100644
--- a/Timeline/src/org/sleuthkit/autopsy/advancedtimeline/ui/detailview/GuideLine.java
+++ b/Timeline/src/org/sleuthkit/autopsy/timeline/ui/detailview/GuideLine.java
@@ -16,7 +16,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.sleuthkit.autopsy.advancedtimeline.ui.detailview;
+package org.sleuthkit.autopsy.timeline.ui.detailview;
 
 import javafx.scene.Cursor;
 import javafx.scene.control.Tooltip;
@@ -24,7 +24,7 @@
 import javafx.scene.paint.Color;
 import javafx.scene.shape.Line;
 import org.joda.time.DateTime;
-import org.sleuthkit.autopsy.advancedtimeline.TimeLineController;
+import org.sleuthkit.autopsy.timeline.TimeLineController;
 
 /**
  *
diff --git a/Timeline/src/org/sleuthkit/autopsy/advancedtimeline/ui/detailview/tree/EventDescriptionTreeItem.java b/Timeline/src/org/sleuthkit/autopsy/timeline/ui/detailview/tree/EventDescriptionTreeItem.java
similarity index 93%
rename from Timeline/src/org/sleuthkit/autopsy/advancedtimeline/ui/detailview/tree/EventDescriptionTreeItem.java
rename to Timeline/src/org/sleuthkit/autopsy/timeline/ui/detailview/tree/EventDescriptionTreeItem.java
index 74bb1e9f73d66a562dc2c7462981557ea779a65f..7a662c28cd3611cebf29172f66a177f50d591ee5 100644
--- a/Timeline/src/org/sleuthkit/autopsy/advancedtimeline/ui/detailview/tree/EventDescriptionTreeItem.java
+++ b/Timeline/src/org/sleuthkit/autopsy/timeline/ui/detailview/tree/EventDescriptionTreeItem.java
@@ -16,11 +16,11 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.sleuthkit.autopsy.advancedtimeline.ui.detailview.tree;
+package org.sleuthkit.autopsy.timeline.ui.detailview.tree;
 
 import java.util.Comparator;
 import javafx.scene.control.TreeItem;
-import org.sleuthkit.autopsy.advancedtimeline.events.AggregateEvent;
+import org.sleuthkit.autopsy.timeline.events.AggregateEvent;
 
 /**
  *
diff --git a/Timeline/src/org/sleuthkit/autopsy/advancedtimeline/ui/detailview/tree/EventTypeTreeItem.java b/Timeline/src/org/sleuthkit/autopsy/timeline/ui/detailview/tree/EventTypeTreeItem.java
similarity index 96%
rename from Timeline/src/org/sleuthkit/autopsy/advancedtimeline/ui/detailview/tree/EventTypeTreeItem.java
rename to Timeline/src/org/sleuthkit/autopsy/timeline/ui/detailview/tree/EventTypeTreeItem.java
index 82d7dfe90507807617e8eb101b79b4c2830f64e0..ba2367e3ea23cba319d13b710bad8ff901b38867 100644
--- a/Timeline/src/org/sleuthkit/autopsy/advancedtimeline/ui/detailview/tree/EventTypeTreeItem.java
+++ b/Timeline/src/org/sleuthkit/autopsy/timeline/ui/detailview/tree/EventTypeTreeItem.java
@@ -16,7 +16,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.sleuthkit.autopsy.advancedtimeline.ui.detailview.tree;
+package org.sleuthkit.autopsy.timeline.ui.detailview.tree;
 
 import java.util.Comparator;
 import java.util.Map;
@@ -24,7 +24,7 @@
 import javafx.application.Platform;
 import javafx.collections.FXCollections;
 import javafx.scene.control.TreeItem;
-import org.sleuthkit.autopsy.advancedtimeline.events.AggregateEvent;
+import org.sleuthkit.autopsy.timeline.events.AggregateEvent;
 
 class EventTypeTreeItem extends NavTreeItem {
 
diff --git a/Timeline/src/org/sleuthkit/autopsy/advancedtimeline/ui/detailview/tree/NavPanel.fxml b/Timeline/src/org/sleuthkit/autopsy/timeline/ui/detailview/tree/NavPanel.fxml
similarity index 100%
rename from Timeline/src/org/sleuthkit/autopsy/advancedtimeline/ui/detailview/tree/NavPanel.fxml
rename to Timeline/src/org/sleuthkit/autopsy/timeline/ui/detailview/tree/NavPanel.fxml
diff --git a/Timeline/src/org/sleuthkit/autopsy/advancedtimeline/ui/detailview/tree/NavPanel.java b/Timeline/src/org/sleuthkit/autopsy/timeline/ui/detailview/tree/NavPanel.java
similarity index 90%
rename from Timeline/src/org/sleuthkit/autopsy/advancedtimeline/ui/detailview/tree/NavPanel.java
rename to Timeline/src/org/sleuthkit/autopsy/timeline/ui/detailview/tree/NavPanel.java
index 322e5e9a3f2fefcbc99ce30f43b351ef803ec89e..dd368a5257318bba27804eb3adaf4d292d141f91 100644
--- a/Timeline/src/org/sleuthkit/autopsy/advancedtimeline/ui/detailview/tree/NavPanel.java
+++ b/Timeline/src/org/sleuthkit/autopsy/timeline/ui/detailview/tree/NavPanel.java
@@ -16,7 +16,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.sleuthkit.autopsy.advancedtimeline.ui.detailview.tree;
+package org.sleuthkit.autopsy.timeline.ui.detailview.tree;
 
 import java.net.URL;
 import java.util.Arrays;
@@ -36,13 +36,13 @@
 import javafx.scene.layout.BorderPane;
 import javafx.scene.layout.StackPane;
 import javafx.scene.shape.Rectangle;
-import org.sleuthkit.autopsy.advancedtimeline.FXMLConstructor;
-import org.sleuthkit.autopsy.advancedtimeline.TimeLineController;
-import org.sleuthkit.autopsy.advancedtimeline.TimeLineView;
-import org.sleuthkit.autopsy.advancedtimeline.events.AggregateEvent;
-import org.sleuthkit.autopsy.advancedtimeline.events.FilteredEventsModel;
-import org.sleuthkit.autopsy.advancedtimeline.ui.detailview.AggregateEventNode;
-import org.sleuthkit.autopsy.advancedtimeline.ui.detailview.DetailViewPane;
+import org.sleuthkit.autopsy.timeline.FXMLConstructor;
+import org.sleuthkit.autopsy.timeline.TimeLineController;
+import org.sleuthkit.autopsy.timeline.TimeLineView;
+import org.sleuthkit.autopsy.timeline.events.AggregateEvent;
+import org.sleuthkit.autopsy.timeline.events.FilteredEventsModel;
+import org.sleuthkit.autopsy.timeline.ui.detailview.AggregateEventNode;
+import org.sleuthkit.autopsy.timeline.ui.detailview.DetailViewPane;
 
 /**
  * Display two trees. one shows all folders (groups) and calls out folders with
diff --git a/Timeline/src/org/sleuthkit/autopsy/advancedtimeline/ui/detailview/tree/NavTreeItem.java b/Timeline/src/org/sleuthkit/autopsy/timeline/ui/detailview/tree/NavTreeItem.java
similarity index 90%
rename from Timeline/src/org/sleuthkit/autopsy/advancedtimeline/ui/detailview/tree/NavTreeItem.java
rename to Timeline/src/org/sleuthkit/autopsy/timeline/ui/detailview/tree/NavTreeItem.java
index 9ca229208186cda5002e7f8026557b2ad28402fc..c880c29b36799a796bc5a6d43ad0adc95cdf0e73 100644
--- a/Timeline/src/org/sleuthkit/autopsy/advancedtimeline/ui/detailview/tree/NavTreeItem.java
+++ b/Timeline/src/org/sleuthkit/autopsy/timeline/ui/detailview/tree/NavTreeItem.java
@@ -16,11 +16,11 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.sleuthkit.autopsy.advancedtimeline.ui.detailview.tree;
+package org.sleuthkit.autopsy.timeline.ui.detailview.tree;
 
 import java.util.Comparator;
 import javafx.scene.control.TreeItem;
-import org.sleuthkit.autopsy.advancedtimeline.events.AggregateEvent;
+import org.sleuthkit.autopsy.timeline.events.AggregateEvent;
 
 /** A node in the nav tree. Manages inserts and resorts. Has parents
  * and children. Does not have graphical properties these are configured in
diff --git a/Timeline/src/org/sleuthkit/autopsy/advancedtimeline/ui/detailview/tree/NavTreeNode.java b/Timeline/src/org/sleuthkit/autopsy/timeline/ui/detailview/tree/NavTreeNode.java
similarity index 91%
rename from Timeline/src/org/sleuthkit/autopsy/advancedtimeline/ui/detailview/tree/NavTreeNode.java
rename to Timeline/src/org/sleuthkit/autopsy/timeline/ui/detailview/tree/NavTreeNode.java
index 094f5ba59dfd7c1673206107f6b65df75f58af11..46f7689654c8d468878efc50a32bec3b047ea8c7 100644
--- a/Timeline/src/org/sleuthkit/autopsy/advancedtimeline/ui/detailview/tree/NavTreeNode.java
+++ b/Timeline/src/org/sleuthkit/autopsy/timeline/ui/detailview/tree/NavTreeNode.java
@@ -16,10 +16,10 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.sleuthkit.autopsy.advancedtimeline.ui.detailview.tree;
+package org.sleuthkit.autopsy.timeline.ui.detailview.tree;
 
 import javax.annotation.concurrent.Immutable;
-import org.sleuthkit.autopsy.advancedtimeline.events.type.EventType;
+import org.sleuthkit.autopsy.timeline.events.type.EventType;
 
 /** The data item for the nav tree. Represents a combination of type and
  * description, as well as the corresponding number of events */
diff --git a/Timeline/src/org/sleuthkit/autopsy/advancedtimeline/ui/detailview/tree/RootItem.java b/Timeline/src/org/sleuthkit/autopsy/timeline/ui/detailview/tree/RootItem.java
similarity index 92%
rename from Timeline/src/org/sleuthkit/autopsy/advancedtimeline/ui/detailview/tree/RootItem.java
rename to Timeline/src/org/sleuthkit/autopsy/timeline/ui/detailview/tree/RootItem.java
index 33f9c1c019acaa5f0dec6fbb9ea75325900f5977..f15f66f31b1c25e03ddcf963e9516526726b933e 100644
--- a/Timeline/src/org/sleuthkit/autopsy/advancedtimeline/ui/detailview/tree/RootItem.java
+++ b/Timeline/src/org/sleuthkit/autopsy/timeline/ui/detailview/tree/RootItem.java
@@ -16,7 +16,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.sleuthkit.autopsy.advancedtimeline.ui.detailview.tree;
+package org.sleuthkit.autopsy.timeline.ui.detailview.tree;
 
 import java.util.Comparator;
 import java.util.HashMap;
@@ -24,8 +24,8 @@
 import javafx.application.Platform;
 import javafx.collections.FXCollections;
 import javafx.scene.control.TreeItem;
-import org.sleuthkit.autopsy.advancedtimeline.events.type.EventType;
-import org.sleuthkit.autopsy.advancedtimeline.events.AggregateEvent;
+import org.sleuthkit.autopsy.timeline.events.type.EventType;
+import org.sleuthkit.autopsy.timeline.events.AggregateEvent;
 
 /**
  *
diff --git a/Timeline/src/org/sleuthkit/autopsy/advancedtimeline/ui/detailview/tree/TreeComparator.java b/Timeline/src/org/sleuthkit/autopsy/timeline/ui/detailview/tree/TreeComparator.java
similarity index 92%
rename from Timeline/src/org/sleuthkit/autopsy/advancedtimeline/ui/detailview/tree/TreeComparator.java
rename to Timeline/src/org/sleuthkit/autopsy/timeline/ui/detailview/tree/TreeComparator.java
index 6fd51910bd5851de372d285faf2174eeed441a31..5da9a49d4251acd52a7938f369bb7c1f3c6048bd 100644
--- a/Timeline/src/org/sleuthkit/autopsy/advancedtimeline/ui/detailview/tree/TreeComparator.java
+++ b/Timeline/src/org/sleuthkit/autopsy/timeline/ui/detailview/tree/TreeComparator.java
@@ -16,11 +16,11 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.sleuthkit.autopsy.advancedtimeline.ui.detailview.tree;
+package org.sleuthkit.autopsy.timeline.ui.detailview.tree;
 
 import java.util.Comparator;
 import javafx.scene.control.TreeItem;
-import org.sleuthkit.autopsy.advancedtimeline.events.type.EventType;
+import org.sleuthkit.autopsy.timeline.events.type.EventType;
 
 enum TreeComparator implements Comparator<TreeItem<NavTreeNode>> {
 
diff --git a/Timeline/src/org/sleuthkit/autopsy/advancedtimeline/ui/filtering/FilterCheckBoxCell.java b/Timeline/src/org/sleuthkit/autopsy/timeline/ui/filtering/FilterCheckBoxCell.java
similarity index 92%
rename from Timeline/src/org/sleuthkit/autopsy/advancedtimeline/ui/filtering/FilterCheckBoxCell.java
rename to Timeline/src/org/sleuthkit/autopsy/timeline/ui/filtering/FilterCheckBoxCell.java
index f4c0b38f2c20b40248abfb02eb0fb09adfc5bc3c..026ca01b89d472fdd67bca2649cd164f24441ad3 100644
--- a/Timeline/src/org/sleuthkit/autopsy/advancedtimeline/ui/filtering/FilterCheckBoxCell.java
+++ b/Timeline/src/org/sleuthkit/autopsy/timeline/ui/filtering/FilterCheckBoxCell.java
@@ -16,11 +16,11 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.sleuthkit.autopsy.advancedtimeline.ui.filtering;
+package org.sleuthkit.autopsy.timeline.ui.filtering;
 
 import javafx.scene.control.CheckBox;
 import javafx.scene.control.TreeTableCell;
-import org.sleuthkit.autopsy.advancedtimeline.filters.AbstractFilter;
+import org.sleuthkit.autopsy.timeline.filters.AbstractFilter;
 
 /**
  *
diff --git a/Timeline/src/org/sleuthkit/autopsy/advancedtimeline/ui/filtering/FilterSetPanel.fxml b/Timeline/src/org/sleuthkit/autopsy/timeline/ui/filtering/FilterSetPanel.fxml
similarity index 100%
rename from Timeline/src/org/sleuthkit/autopsy/advancedtimeline/ui/filtering/FilterSetPanel.fxml
rename to Timeline/src/org/sleuthkit/autopsy/timeline/ui/filtering/FilterSetPanel.fxml
diff --git a/Timeline/src/org/sleuthkit/autopsy/advancedtimeline/ui/filtering/FilterSetPanel.java b/Timeline/src/org/sleuthkit/autopsy/timeline/ui/filtering/FilterSetPanel.java
similarity index 91%
rename from Timeline/src/org/sleuthkit/autopsy/advancedtimeline/ui/filtering/FilterSetPanel.java
rename to Timeline/src/org/sleuthkit/autopsy/timeline/ui/filtering/FilterSetPanel.java
index df464d30eb210eebdba9ab5063b96d6d77786030..89f379f80f53969716b9b0bfe7fb7e36e825856e 100644
--- a/Timeline/src/org/sleuthkit/autopsy/advancedtimeline/ui/filtering/FilterSetPanel.java
+++ b/Timeline/src/org/sleuthkit/autopsy/timeline/ui/filtering/FilterSetPanel.java
@@ -16,7 +16,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.sleuthkit.autopsy.advancedtimeline.ui.filtering;
+package org.sleuthkit.autopsy.timeline.ui.filtering;
 
 import java.net.URL;
 import java.util.ResourceBundle;
@@ -32,13 +32,13 @@
 import javafx.scene.control.TreeTableView;
 import javafx.scene.layout.BorderPane;
 import org.controlsfx.control.action.AbstractAction;
-import org.sleuthkit.autopsy.advancedtimeline.FXMLConstructor;
-import org.sleuthkit.autopsy.advancedtimeline.TimeLineController;
-import org.sleuthkit.autopsy.advancedtimeline.TimeLineView;
-import org.sleuthkit.autopsy.advancedtimeline.actions.DefaultFilters;
-import org.sleuthkit.autopsy.advancedtimeline.events.FilteredEventsModel;
-import org.sleuthkit.autopsy.advancedtimeline.filters.AbstractFilter;
-import org.sleuthkit.autopsy.advancedtimeline.filters.Filter;
+import org.sleuthkit.autopsy.timeline.FXMLConstructor;
+import org.sleuthkit.autopsy.timeline.TimeLineController;
+import org.sleuthkit.autopsy.timeline.TimeLineView;
+import org.sleuthkit.autopsy.timeline.actions.DefaultFilters;
+import org.sleuthkit.autopsy.timeline.events.FilteredEventsModel;
+import org.sleuthkit.autopsy.timeline.filters.AbstractFilter;
+import org.sleuthkit.autopsy.timeline.filters.Filter;
 
 /** The FXML controller for the filter ui.
  *
diff --git a/Timeline/src/org/sleuthkit/autopsy/advancedtimeline/ui/filtering/FilterTable.css b/Timeline/src/org/sleuthkit/autopsy/timeline/ui/filtering/FilterTable.css
similarity index 100%
rename from Timeline/src/org/sleuthkit/autopsy/advancedtimeline/ui/filtering/FilterTable.css
rename to Timeline/src/org/sleuthkit/autopsy/timeline/ui/filtering/FilterTable.css
diff --git a/Timeline/src/org/sleuthkit/autopsy/advancedtimeline/ui/filtering/FilterTreeItem.java b/Timeline/src/org/sleuthkit/autopsy/timeline/ui/filtering/FilterTreeItem.java
similarity index 79%
rename from Timeline/src/org/sleuthkit/autopsy/advancedtimeline/ui/filtering/FilterTreeItem.java
rename to Timeline/src/org/sleuthkit/autopsy/timeline/ui/filtering/FilterTreeItem.java
index 3065db05dc48484d85595084dc057804e004d714..2302099939f36fc1ae3a4ae17f4e82172cc7e5a1 100644
--- a/Timeline/src/org/sleuthkit/autopsy/advancedtimeline/ui/filtering/FilterTreeItem.java
+++ b/Timeline/src/org/sleuthkit/autopsy/timeline/ui/filtering/FilterTreeItem.java
@@ -1,8 +1,8 @@
-package org.sleuthkit.autopsy.advancedtimeline.ui.filtering;
+package org.sleuthkit.autopsy.timeline.ui.filtering;
 
 import javafx.scene.control.TreeItem;
-import org.sleuthkit.autopsy.advancedtimeline.filters.CompoundFilter;
-import org.sleuthkit.autopsy.advancedtimeline.filters.Filter;
+import org.sleuthkit.autopsy.timeline.filters.CompoundFilter;
+import org.sleuthkit.autopsy.timeline.filters.Filter;
 
 /** A TreeItem for a filter. */
 public class FilterTreeItem extends TreeItem<Filter> {
diff --git a/Timeline/src/org/sleuthkit/autopsy/advancedtimeline/ui/filtering/LegendCell.java b/Timeline/src/org/sleuthkit/autopsy/timeline/ui/filtering/LegendCell.java
similarity index 89%
rename from Timeline/src/org/sleuthkit/autopsy/advancedtimeline/ui/filtering/LegendCell.java
rename to Timeline/src/org/sleuthkit/autopsy/timeline/ui/filtering/LegendCell.java
index 1369782e22a7fa0d7b4554e8ee145304d66ba2b9..23e6f25055f66fec680444a5a912b9472f229bf0 100644
--- a/Timeline/src/org/sleuthkit/autopsy/advancedtimeline/ui/filtering/LegendCell.java
+++ b/Timeline/src/org/sleuthkit/autopsy/timeline/ui/filtering/LegendCell.java
@@ -16,7 +16,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.sleuthkit.autopsy.advancedtimeline.ui.filtering;
+package org.sleuthkit.autopsy.timeline.ui.filtering;
 
 import javafx.application.Platform;
 import javafx.beans.value.ObservableValue;
@@ -28,13 +28,13 @@
 import javafx.scene.layout.HBox;
 import javafx.scene.paint.Color;
 import javafx.scene.shape.Rectangle;
-import org.sleuthkit.autopsy.advancedtimeline.TimeLineController;
-import org.sleuthkit.autopsy.advancedtimeline.TimeLineView;
-import org.sleuthkit.autopsy.advancedtimeline.events.FilteredEventsModel;
-import org.sleuthkit.autopsy.advancedtimeline.filters.AbstractFilter;
-import org.sleuthkit.autopsy.advancedtimeline.filters.TextFilter;
-import org.sleuthkit.autopsy.advancedtimeline.filters.TypeFilter;
-import org.sleuthkit.autopsy.advancedtimeline.zooming.EventTypeZoomLevel;
+import org.sleuthkit.autopsy.timeline.TimeLineController;
+import org.sleuthkit.autopsy.timeline.TimeLineView;
+import org.sleuthkit.autopsy.timeline.events.FilteredEventsModel;
+import org.sleuthkit.autopsy.timeline.filters.AbstractFilter;
+import org.sleuthkit.autopsy.timeline.filters.TextFilter;
+import org.sleuthkit.autopsy.timeline.filters.TypeFilter;
+import org.sleuthkit.autopsy.timeline.zooming.EventTypeZoomLevel;
 
 /**
  * A TreeTableCell that shows an icon and color corresponding to the
diff --git a/Timeline/src/org/sleuthkit/autopsy/advancedtimeline/utils/ColorUtilities.java b/Timeline/src/org/sleuthkit/autopsy/timeline/utils/ColorUtilities.java
similarity index 95%
rename from Timeline/src/org/sleuthkit/autopsy/advancedtimeline/utils/ColorUtilities.java
rename to Timeline/src/org/sleuthkit/autopsy/timeline/utils/ColorUtilities.java
index 19b2c6085dea38ca1820283d23b3f3e80771d5b9..8a7e614f7d35ef9ca960815f91b3cc7c7f0c7085 100644
--- a/Timeline/src/org/sleuthkit/autopsy/advancedtimeline/utils/ColorUtilities.java
+++ b/Timeline/src/org/sleuthkit/autopsy/timeline/utils/ColorUtilities.java
@@ -16,7 +16,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.sleuthkit.autopsy.advancedtimeline.utils;
+package org.sleuthkit.autopsy.timeline.utils;
 
 import javafx.scene.paint.Color;
 
diff --git a/Timeline/src/org/sleuthkit/autopsy/advancedtimeline/utils/IntervalUtils.java b/Timeline/src/org/sleuthkit/autopsy/timeline/utils/IntervalUtils.java
similarity index 92%
rename from Timeline/src/org/sleuthkit/autopsy/advancedtimeline/utils/IntervalUtils.java
rename to Timeline/src/org/sleuthkit/autopsy/timeline/utils/IntervalUtils.java
index aa8d9d61331dae13ed8ce052bdb4baebace68ff5..ab03330b2c7f57eee4af9750d9008d10d84085df 100644
--- a/Timeline/src/org/sleuthkit/autopsy/advancedtimeline/utils/IntervalUtils.java
+++ b/Timeline/src/org/sleuthkit/autopsy/timeline/utils/IntervalUtils.java
@@ -16,14 +16,14 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.sleuthkit.autopsy.advancedtimeline.utils;
+package org.sleuthkit.autopsy.timeline.utils;
 
 import java.util.Collection;
 import org.joda.time.DateTime;
 import org.joda.time.DateTimeZone;
 import org.joda.time.Interval;
 import org.joda.time.ReadablePeriod;
-import org.sleuthkit.autopsy.advancedtimeline.zooming.TimeUnits;
+import org.sleuthkit.autopsy.timeline.zooming.TimeUnits;
 
 /**
  *
@@ -56,7 +56,7 @@ static public Interval extendInterval(Interval range, final Long eventTime) {
      * @return
      *
      * @deprecated Moved to
-     * {@link org.sleuthkit.autopsy.advancedtimeline.visualization.RangeDivisionInfo#getRangeDivisionInfo}
+     * {@link org.sleuthkit.autopsy.timeline.visualization.RangeDivisionInfo#getRangeDivisionInfo}
      */
     @Deprecated
     public static RangeDivisionInfo getRangeDivisionInfo(Interval timeRange) {
diff --git a/Timeline/src/org/sleuthkit/autopsy/advancedtimeline/utils/ObservableStack.java b/Timeline/src/org/sleuthkit/autopsy/timeline/utils/ObservableStack.java
similarity index 96%
rename from Timeline/src/org/sleuthkit/autopsy/advancedtimeline/utils/ObservableStack.java
rename to Timeline/src/org/sleuthkit/autopsy/timeline/utils/ObservableStack.java
index ec5b813f85bf6d3367e5985dfa373b0aea78eac5..142434d5ac428ade4eb11954c8173501a0d528c5 100644
--- a/Timeline/src/org/sleuthkit/autopsy/advancedtimeline/utils/ObservableStack.java
+++ b/Timeline/src/org/sleuthkit/autopsy/timeline/utils/ObservableStack.java
@@ -16,7 +16,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.sleuthkit.autopsy.advancedtimeline.utils;
+package org.sleuthkit.autopsy.timeline.utils;
 
 import javafx.beans.property.SimpleListProperty;
 import javafx.collections.FXCollections;
diff --git a/Timeline/src/org/sleuthkit/autopsy/advancedtimeline/utils/RangeDivisionInfo.java b/Timeline/src/org/sleuthkit/autopsy/timeline/utils/RangeDivisionInfo.java
similarity index 97%
rename from Timeline/src/org/sleuthkit/autopsy/advancedtimeline/utils/RangeDivisionInfo.java
rename to Timeline/src/org/sleuthkit/autopsy/timeline/utils/RangeDivisionInfo.java
index 98c4a945127096b0b3bf0597215df8ed9c9bb8a2..5be09e376dc1b9dafa1f059ff1459bb8f61002ce 100644
--- a/Timeline/src/org/sleuthkit/autopsy/advancedtimeline/utils/RangeDivisionInfo.java
+++ b/Timeline/src/org/sleuthkit/autopsy/timeline/utils/RangeDivisionInfo.java
@@ -16,7 +16,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.sleuthkit.autopsy.advancedtimeline.utils;
+package org.sleuthkit.autopsy.timeline.utils;
 
 import javax.annotation.concurrent.Immutable;
 import org.joda.time.DateTime;
@@ -31,8 +31,8 @@
 import org.joda.time.format.DateTimeFormat;
 import org.joda.time.format.DateTimeFormatter;
 import org.joda.time.format.ISODateTimeFormat;
-import org.sleuthkit.autopsy.advancedtimeline.TimeLineController;
-import org.sleuthkit.autopsy.advancedtimeline.zooming.TimeUnits;
+import org.sleuthkit.autopsy.timeline.TimeLineController;
+import org.sleuthkit.autopsy.timeline.zooming.TimeUnits;
 
 /** * bundles up the results of analyzing a time range for the appropriate
  * {@link TimeUnits} to use to visualize it. Partly, this class exists
diff --git a/Timeline/src/org/sleuthkit/autopsy/advancedtimeline/zooming/DescriptionLOD.java b/Timeline/src/org/sleuthkit/autopsy/timeline/zooming/DescriptionLOD.java
similarity index 94%
rename from Timeline/src/org/sleuthkit/autopsy/advancedtimeline/zooming/DescriptionLOD.java
rename to Timeline/src/org/sleuthkit/autopsy/timeline/zooming/DescriptionLOD.java
index c89e644b29733c43bf64633bc2881b692c6e07f6..be12be9825b3c33642debcd2645bf9f47bdd9046 100644
--- a/Timeline/src/org/sleuthkit/autopsy/advancedtimeline/zooming/DescriptionLOD.java
+++ b/Timeline/src/org/sleuthkit/autopsy/timeline/zooming/DescriptionLOD.java
@@ -16,7 +16,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.sleuthkit.autopsy.advancedtimeline.zooming;
+package org.sleuthkit.autopsy.timeline.zooming;
 
 /**
  *
diff --git a/Timeline/src/org/sleuthkit/autopsy/advancedtimeline/zooming/EventTypeZoomLevel.java b/Timeline/src/org/sleuthkit/autopsy/timeline/zooming/EventTypeZoomLevel.java
similarity index 94%
rename from Timeline/src/org/sleuthkit/autopsy/advancedtimeline/zooming/EventTypeZoomLevel.java
rename to Timeline/src/org/sleuthkit/autopsy/timeline/zooming/EventTypeZoomLevel.java
index 9e0d99fae39bd5828ca57c4fd174d9e8213c1884..854f7d73abd7daac3c7a3eb069283d4eead97961 100644
--- a/Timeline/src/org/sleuthkit/autopsy/advancedtimeline/zooming/EventTypeZoomLevel.java
+++ b/Timeline/src/org/sleuthkit/autopsy/timeline/zooming/EventTypeZoomLevel.java
@@ -16,7 +16,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.sleuthkit.autopsy.advancedtimeline.zooming;
+package org.sleuthkit.autopsy.timeline.zooming;
 
 /**
  *
diff --git a/Timeline/src/org/sleuthkit/autopsy/advancedtimeline/zooming/TimeUnits.java b/Timeline/src/org/sleuthkit/autopsy/timeline/zooming/TimeUnits.java
similarity index 97%
rename from Timeline/src/org/sleuthkit/autopsy/advancedtimeline/zooming/TimeUnits.java
rename to Timeline/src/org/sleuthkit/autopsy/timeline/zooming/TimeUnits.java
index bb0b87456ba037f58fac4e47a1c608097a9e5a51..91c97cc981570e5c41fa1e298755fffcc16a8a38 100644
--- a/Timeline/src/org/sleuthkit/autopsy/advancedtimeline/zooming/TimeUnits.java
+++ b/Timeline/src/org/sleuthkit/autopsy/timeline/zooming/TimeUnits.java
@@ -16,7 +16,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.sleuthkit.autopsy.advancedtimeline.zooming;
+package org.sleuthkit.autopsy.timeline.zooming;
 
 import java.time.temporal.ChronoUnit;
 import org.joda.time.Days;
diff --git a/Timeline/src/org/sleuthkit/autopsy/advancedtimeline/zooming/ZoomParams.java b/Timeline/src/org/sleuthkit/autopsy/timeline/zooming/ZoomParams.java
similarity index 97%
rename from Timeline/src/org/sleuthkit/autopsy/advancedtimeline/zooming/ZoomParams.java
rename to Timeline/src/org/sleuthkit/autopsy/timeline/zooming/ZoomParams.java
index 6e0e348c6c60cc91fa20d923250a3c6ae5688da0..a0e523769778124b66239fc1f7d9c6018c7a8b05 100644
--- a/Timeline/src/org/sleuthkit/autopsy/advancedtimeline/zooming/ZoomParams.java
+++ b/Timeline/src/org/sleuthkit/autopsy/timeline/zooming/ZoomParams.java
@@ -16,14 +16,14 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.sleuthkit.autopsy.advancedtimeline.zooming;
+package org.sleuthkit.autopsy.timeline.zooming;
 
 import java.util.Collections;
 import java.util.EnumSet;
 import java.util.Objects;
 import java.util.Set;
 import org.joda.time.Interval;
-import org.sleuthkit.autopsy.advancedtimeline.filters.Filter;
+import org.sleuthkit.autopsy.timeline.filters.Filter;
 
 /**
  * This class encapsulates all the zoom(and filter) parameters into one object
diff --git a/Timeline/src/org/sleuthkit/autopsy/advancedtimeline/zooming/ZoomSettingsPane.fxml b/Timeline/src/org/sleuthkit/autopsy/timeline/zooming/ZoomSettingsPane.fxml
similarity index 100%
rename from Timeline/src/org/sleuthkit/autopsy/advancedtimeline/zooming/ZoomSettingsPane.fxml
rename to Timeline/src/org/sleuthkit/autopsy/timeline/zooming/ZoomSettingsPane.fxml
diff --git a/Timeline/src/org/sleuthkit/autopsy/advancedtimeline/zooming/ZoomSettingsPane.java b/Timeline/src/org/sleuthkit/autopsy/timeline/zooming/ZoomSettingsPane.java
similarity index 93%
rename from Timeline/src/org/sleuthkit/autopsy/advancedtimeline/zooming/ZoomSettingsPane.java
rename to Timeline/src/org/sleuthkit/autopsy/timeline/zooming/ZoomSettingsPane.java
index 42c304bdda4b3d63b91a1972c10f494a0f476e10..f07e113461ce78e50d4544d251d98a3c08a1cd63 100644
--- a/Timeline/src/org/sleuthkit/autopsy/advancedtimeline/zooming/ZoomSettingsPane.java
+++ b/Timeline/src/org/sleuthkit/autopsy/timeline/zooming/ZoomSettingsPane.java
@@ -16,7 +16,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.sleuthkit.autopsy.advancedtimeline.zooming;
+package org.sleuthkit.autopsy.timeline.zooming;
 
 import java.net.URL;
 import java.time.temporal.ChronoUnit;
@@ -30,15 +30,15 @@
 import javafx.scene.control.TitledPane;
 import javafx.scene.control.Tooltip;
 import javafx.util.StringConverter;
-import org.sleuthkit.autopsy.advancedtimeline.FXMLConstructor;
-import org.sleuthkit.autopsy.advancedtimeline.TimeLineController;
-import org.sleuthkit.autopsy.advancedtimeline.TimeLineView;
-import org.sleuthkit.autopsy.advancedtimeline.VisualizationMode;
-import org.sleuthkit.autopsy.advancedtimeline.actions.Back;
-import org.sleuthkit.autopsy.advancedtimeline.actions.Forward;
-import org.sleuthkit.autopsy.advancedtimeline.events.FilteredEventsModel;
-import org.sleuthkit.autopsy.advancedtimeline.utils.IntervalUtils;
-import org.sleuthkit.autopsy.advancedtimeline.utils.RangeDivisionInfo;
+import org.sleuthkit.autopsy.timeline.FXMLConstructor;
+import org.sleuthkit.autopsy.timeline.TimeLineController;
+import org.sleuthkit.autopsy.timeline.TimeLineView;
+import org.sleuthkit.autopsy.timeline.VisualizationMode;
+import org.sleuthkit.autopsy.timeline.actions.Back;
+import org.sleuthkit.autopsy.timeline.actions.Forward;
+import org.sleuthkit.autopsy.timeline.events.FilteredEventsModel;
+import org.sleuthkit.autopsy.timeline.utils.IntervalUtils;
+import org.sleuthkit.autopsy.timeline.utils.RangeDivisionInfo;
 
 /** FXML Controller class for the ZoomSettingsPane.fxml
  *
diff --git a/branding/core/core.jar/org/netbeans/core/startup/Bundle.properties b/branding/core/core.jar/org/netbeans/core/startup/Bundle.properties
index 530300ed09be5855ff5fe155906b41ebffa3c66e..80f404f037c3a2490282e804e3da63f00de22b50 100644
--- a/branding/core/core.jar/org/netbeans/core/startup/Bundle.properties
+++ b/branding/core/core.jar/org/netbeans/core/startup/Bundle.properties
@@ -1,5 +1,5 @@
 #Updated by build script
-#Mon, 25 Aug 2014 14:31:11 -0400
+#Mon, 25 Aug 2014 14:43:13 -0400
 LBL_splash_window_title=Starting Autopsy
 SPLASH_HEIGHT=288
 SPLASH_WIDTH=538
diff --git a/branding/modules/org-netbeans-core-windows.jar/org/netbeans/core/windows/view/ui/Bundle.properties b/branding/modules/org-netbeans-core-windows.jar/org/netbeans/core/windows/view/ui/Bundle.properties
index 97af67d47366f8a79b354ca04054bf948b3e2c0d..a6b4a797ef0808e14e6896b49d268a76cb8d9572 100644
--- a/branding/modules/org-netbeans-core-windows.jar/org/netbeans/core/windows/view/ui/Bundle.properties
+++ b/branding/modules/org-netbeans-core-windows.jar/org/netbeans/core/windows/view/ui/Bundle.properties
@@ -1,5 +1,5 @@
 #Updated by build script
-#Mon, 25 Aug 2014 14:31:11 -0400
+#Mon, 25 Aug 2014 14:43:13 -0400
 
 CTL_MainWindow_Title=Autopsy 3.1.0
 CTL_MainWindow_Title_No_Project=Autopsy 3.1.0