diff --git a/src/jdbernard/timestamper/resources/about.png b/src/jdbernard/timestamper/gui/resources/about.png
old mode 100755
new mode 100644
similarity index 100%
rename from src/jdbernard/timestamper/resources/about.png
rename to src/jdbernard/timestamper/gui/resources/about.png
diff --git a/src/jdbernard/timestamper/resources/icons/12-em-cross.png b/src/jdbernard/timestamper/gui/resources/icons/12-em-cross.png
old mode 100755
new mode 100644
similarity index 100%
rename from src/jdbernard/timestamper/resources/icons/12-em-cross.png
rename to src/jdbernard/timestamper/gui/resources/icons/12-em-cross.png
diff --git a/src/jdbernard/timestamper/resources/icons/16-em-cross-hover.png b/src/jdbernard/timestamper/gui/resources/icons/16-em-cross-hover.png
old mode 100755
new mode 100644
similarity index 100%
rename from src/jdbernard/timestamper/resources/icons/16-em-cross-hover.png
rename to src/jdbernard/timestamper/gui/resources/icons/16-em-cross-hover.png
diff --git a/src/jdbernard/timestamper/resources/icons/16-em-cross.png b/src/jdbernard/timestamper/gui/resources/icons/16-em-cross.png
old mode 100755
new mode 100644
similarity index 100%
rename from src/jdbernard/timestamper/resources/icons/16-em-cross.png
rename to src/jdbernard/timestamper/gui/resources/icons/16-em-cross.png
diff --git a/src/jdbernard/timestamper/resources/icons/16-em-pencil.png b/src/jdbernard/timestamper/gui/resources/icons/16-em-pencil.png
old mode 100755
new mode 100644
similarity index 100%
rename from src/jdbernard/timestamper/resources/icons/16-em-pencil.png
rename to src/jdbernard/timestamper/gui/resources/icons/16-em-pencil.png
diff --git a/src/jdbernard/timestamper/resources/icons/16-file-archive.png b/src/jdbernard/timestamper/gui/resources/icons/16-file-archive.png
old mode 100755
new mode 100644
similarity index 100%
rename from src/jdbernard/timestamper/resources/icons/16-file-archive.png
rename to src/jdbernard/timestamper/gui/resources/icons/16-file-archive.png
diff --git a/src/jdbernard/timestamper/resources/icons/16-square-green-add.png b/src/jdbernard/timestamper/gui/resources/icons/16-square-green-add.png
old mode 100755
new mode 100644
similarity index 100%
rename from src/jdbernard/timestamper/resources/icons/16-square-green-add.png
rename to src/jdbernard/timestamper/gui/resources/icons/16-square-green-add.png
diff --git a/src/jdbernard/timestamper/resources/icons/16-square-red-delete.png b/src/jdbernard/timestamper/gui/resources/icons/16-square-red-delete.png
old mode 100755
new mode 100644
similarity index 100%
rename from src/jdbernard/timestamper/resources/icons/16-square-red-delete.png
rename to src/jdbernard/timestamper/gui/resources/icons/16-square-red-delete.png
diff --git a/src/jdbernard/timestamper/resources/icons/16-tool-a-hover.png b/src/jdbernard/timestamper/gui/resources/icons/16-tool-a-hover.png
old mode 100755
new mode 100644
similarity index 100%
rename from src/jdbernard/timestamper/resources/icons/16-tool-a-hover.png
rename to src/jdbernard/timestamper/gui/resources/icons/16-tool-a-hover.png
diff --git a/src/jdbernard/timestamper/resources/icons/16-tool-a.png b/src/jdbernard/timestamper/gui/resources/icons/16-tool-a.png
old mode 100755
new mode 100644
similarity index 100%
rename from src/jdbernard/timestamper/resources/icons/16-tool-a.png
rename to src/jdbernard/timestamper/gui/resources/icons/16-tool-a.png
diff --git a/src/jdbernard/timestamper/resources/icons/24-em-cross.png b/src/jdbernard/timestamper/gui/resources/icons/24-em-cross.png
old mode 100755
new mode 100644
similarity index 100%
rename from src/jdbernard/timestamper/resources/icons/24-em-cross.png
rename to src/jdbernard/timestamper/gui/resources/icons/24-em-cross.png
diff --git a/src/jdbernard/timestamper/resources/icons/24-message-info.png b/src/jdbernard/timestamper/gui/resources/icons/24-message-info.png
old mode 100755
new mode 100644
similarity index 100%
rename from src/jdbernard/timestamper/resources/icons/24-message-info.png
rename to src/jdbernard/timestamper/gui/resources/icons/24-message-info.png
diff --git a/src/jdbernard/timestamper/resources/icons/appointment-new-16x16.png b/src/jdbernard/timestamper/gui/resources/icons/appointment-new-16x16.png
old mode 100755
new mode 100644
similarity index 100%
rename from src/jdbernard/timestamper/resources/icons/appointment-new-16x16.png
rename to src/jdbernard/timestamper/gui/resources/icons/appointment-new-16x16.png
diff --git a/src/jdbernard/timestamper/resources/icons/appointment-new-32x32.png b/src/jdbernard/timestamper/gui/resources/icons/appointment-new-32x32.png
similarity index 100%
rename from src/jdbernard/timestamper/resources/icons/appointment-new-32x32.png
rename to src/jdbernard/timestamper/gui/resources/icons/appointment-new-32x32.png
diff --git a/src/jdbernard/timestamper/resources/icons/close.gif b/src/jdbernard/timestamper/gui/resources/icons/close.gif
old mode 100755
new mode 100644
similarity index 100%
rename from src/jdbernard/timestamper/resources/icons/close.gif
rename to src/jdbernard/timestamper/gui/resources/icons/close.gif
diff --git a/src/jdbernard/timestamper/resources/icons/document-open-16x16.png b/src/jdbernard/timestamper/gui/resources/icons/document-open-16x16.png
old mode 100755
new mode 100644
similarity index 100%
rename from src/jdbernard/timestamper/resources/icons/document-open-16x16.png
rename to src/jdbernard/timestamper/gui/resources/icons/document-open-16x16.png
diff --git a/src/jdbernard/timestamper/resources/icons/document-save-16x16.png b/src/jdbernard/timestamper/gui/resources/icons/document-save-16x16.png
old mode 100755
new mode 100644
similarity index 100%
rename from src/jdbernard/timestamper/resources/icons/document-save-16x16.png
rename to src/jdbernard/timestamper/gui/resources/icons/document-save-16x16.png
diff --git a/src/jdbernard/timestamper/resources/icons/document-save-as-16x16.png b/src/jdbernard/timestamper/gui/resources/icons/document-save-as-16x16.png
old mode 100755
new mode 100644
similarity index 100%
rename from src/jdbernard/timestamper/resources/icons/document-save-as-16x16.png
rename to src/jdbernard/timestamper/gui/resources/icons/document-save-as-16x16.png
diff --git a/src/jdbernard/timestamper/resources/icons/media-playback-reverse.png b/src/jdbernard/timestamper/gui/resources/icons/media-playback-reverse.png
old mode 100755
new mode 100644
similarity index 100%
rename from src/jdbernard/timestamper/resources/icons/media-playback-reverse.png
rename to src/jdbernard/timestamper/gui/resources/icons/media-playback-reverse.png
diff --git a/src/jdbernard/timestamper/resources/icons/media-playback-start.png b/src/jdbernard/timestamper/gui/resources/icons/media-playback-start.png
old mode 100755
new mode 100644
similarity index 100%
rename from src/jdbernard/timestamper/resources/icons/media-playback-start.png
rename to src/jdbernard/timestamper/gui/resources/icons/media-playback-start.png
diff --git a/src/jdbernard/timestamper/resources/icons/media-seek-backward.png b/src/jdbernard/timestamper/gui/resources/icons/media-seek-backward.png
old mode 100755
new mode 100644
similarity index 100%
rename from src/jdbernard/timestamper/resources/icons/media-seek-backward.png
rename to src/jdbernard/timestamper/gui/resources/icons/media-seek-backward.png
diff --git a/src/jdbernard/timestamper/resources/icons/media-seek-forward.png b/src/jdbernard/timestamper/gui/resources/icons/media-seek-forward.png
old mode 100755
new mode 100644
similarity index 100%
rename from src/jdbernard/timestamper/resources/icons/media-seek-forward.png
rename to src/jdbernard/timestamper/gui/resources/icons/media-seek-forward.png
diff --git a/src/jdbernard/timestamper/resources/icons/media-skip-backward.png b/src/jdbernard/timestamper/gui/resources/icons/media-skip-backward.png
old mode 100755
new mode 100644
similarity index 100%
rename from src/jdbernard/timestamper/resources/icons/media-skip-backward.png
rename to src/jdbernard/timestamper/gui/resources/icons/media-skip-backward.png
diff --git a/src/jdbernard/timestamper/resources/icons/media-skip-forward.png b/src/jdbernard/timestamper/gui/resources/icons/media-skip-forward.png
old mode 100755
new mode 100644
similarity index 100%
rename from src/jdbernard/timestamper/resources/icons/media-skip-forward.png
rename to src/jdbernard/timestamper/gui/resources/icons/media-skip-forward.png
diff --git a/src/jdbernard/timestamper/resources/splash.png b/src/jdbernard/timestamper/gui/resources/splash.png
old mode 100755
new mode 100644
similarity index 100%
rename from src/jdbernard/timestamper/resources/splash.png
rename to src/jdbernard/timestamper/gui/resources/splash.png
diff --git a/timeline.default.properties b/timeline.default.properties
new file mode 100644
index 0000000..61c1239
--- /dev/null
+++ b/timeline.default.properties
@@ -0,0 +1,3 @@
+#
+#Mon Oct 19 17:50:18 CDT 2009
+timeline.uri=file\:/C\:/Documents%20and%20Settings/jbernard/My%20Documents/Projects/Non-Gemalto/TimeStamper/timeline.default.txt
diff --git a/timeline.default.txt b/timeline.default.txt
new file mode 100644
index 0000000..e69de29
diff --git a/timestamper.config b/timestamper.config
new file mode 100644
index 0000000..e69de29