diff --git a/trackprofiler/.classpath b/src/.classpath
similarity index 100%
rename from trackprofiler/.classpath
rename to src/.classpath
diff --git a/trackprofiler/.project b/src/.project
similarity index 100%
rename from trackprofiler/.project
rename to src/.project
diff --git a/trackprofiler/.settings/org.eclipse.jdt.core.prefs b/src/.settings/org.eclipse.jdt.core.prefs
similarity index 100%
rename from trackprofiler/.settings/org.eclipse.jdt.core.prefs
rename to src/.settings/org.eclipse.jdt.core.prefs
diff --git a/trackprofiler/.settings/org.eclipse.jdt.ui.prefs b/src/.settings/org.eclipse.jdt.ui.prefs
similarity index 100%
rename from trackprofiler/.settings/org.eclipse.jdt.ui.prefs
rename to src/.settings/org.eclipse.jdt.ui.prefs
diff --git a/trackprofiler/com/cloudgarden/layout/AnchorConstraint.java b/src/com/cloudgarden/layout/AnchorConstraint.java
similarity index 100%
rename from trackprofiler/com/cloudgarden/layout/AnchorConstraint.java
rename to src/com/cloudgarden/layout/AnchorConstraint.java
diff --git a/trackprofiler/com/cloudgarden/layout/AnchorLayout.java b/src/com/cloudgarden/layout/AnchorLayout.java
similarity index 100%
rename from trackprofiler/com/cloudgarden/layout/AnchorLayout.java
rename to src/com/cloudgarden/layout/AnchorLayout.java
diff --git a/trackprofiler/info/puzz/trackprofiler/Messages.java b/src/info/puzz/trackprofiler/Messages.java
similarity index 100%
rename from trackprofiler/info/puzz/trackprofiler/Messages.java
rename to src/info/puzz/trackprofiler/Messages.java
diff --git a/trackprofiler/info/puzz/trackprofiler/TrackProfilerAppContext.java b/src/info/puzz/trackprofiler/TrackProfilerAppContext.java
similarity index 100%
rename from trackprofiler/info/puzz/trackprofiler/TrackProfilerAppContext.java
rename to src/info/puzz/trackprofiler/TrackProfilerAppContext.java
diff --git a/trackprofiler/info/puzz/trackprofiler/TrackProfilerAppStarter.java b/src/info/puzz/trackprofiler/TrackProfilerAppStarter.java
similarity index 100%
rename from trackprofiler/info/puzz/trackprofiler/TrackProfilerAppStarter.java
rename to src/info/puzz/trackprofiler/TrackProfilerAppStarter.java
diff --git a/trackprofiler/info/puzz/trackprofiler/TrackProfilerException.java b/src/info/puzz/trackprofiler/TrackProfilerException.java
similarity index 100%
rename from trackprofiler/info/puzz/trackprofiler/TrackProfilerException.java
rename to src/info/puzz/trackprofiler/TrackProfilerException.java
diff --git a/trackprofiler/info/puzz/trackprofiler/appobjects/AbstractPoint.java b/src/info/puzz/trackprofiler/appobjects/AbstractPoint.java
similarity index 100%
rename from trackprofiler/info/puzz/trackprofiler/appobjects/AbstractPoint.java
rename to src/info/puzz/trackprofiler/appobjects/AbstractPoint.java
diff --git a/trackprofiler/info/puzz/trackprofiler/appobjects/Track.java b/src/info/puzz/trackprofiler/appobjects/Track.java
similarity index 100%
rename from trackprofiler/info/puzz/trackprofiler/appobjects/Track.java
rename to src/info/puzz/trackprofiler/appobjects/Track.java
diff --git a/trackprofiler/info/puzz/trackprofiler/appobjects/TrackExtreeme.java b/src/info/puzz/trackprofiler/appobjects/TrackExtreeme.java
similarity index 100%
rename from trackprofiler/info/puzz/trackprofiler/appobjects/TrackExtreeme.java
rename to src/info/puzz/trackprofiler/appobjects/TrackExtreeme.java
diff --git a/trackprofiler/info/puzz/trackprofiler/appobjects/TrackLoader.java b/src/info/puzz/trackprofiler/appobjects/TrackLoader.java
similarity index 100%
rename from trackprofiler/info/puzz/trackprofiler/appobjects/TrackLoader.java
rename to src/info/puzz/trackprofiler/appobjects/TrackLoader.java
diff --git a/trackprofiler/info/puzz/trackprofiler/appobjects/TrackPoint.java b/src/info/puzz/trackprofiler/appobjects/TrackPoint.java
similarity index 100%
rename from trackprofiler/info/puzz/trackprofiler/appobjects/TrackPoint.java
rename to src/info/puzz/trackprofiler/appobjects/TrackPoint.java
diff --git a/trackprofiler/info/puzz/trackprofiler/appobjects/Waypoint.java b/src/info/puzz/trackprofiler/appobjects/Waypoint.java
similarity index 100%
rename from trackprofiler/info/puzz/trackprofiler/appobjects/Waypoint.java
rename to src/info/puzz/trackprofiler/appobjects/Waypoint.java
diff --git a/trackprofiler/info/puzz/trackprofiler/appobjects/Waypoints.java b/src/info/puzz/trackprofiler/appobjects/Waypoints.java
similarity index 100%
rename from trackprofiler/info/puzz/trackprofiler/appobjects/Waypoints.java
rename to src/info/puzz/trackprofiler/appobjects/Waypoints.java
diff --git a/trackprofiler/info/puzz/trackprofiler/gui/GUIConstants.java b/src/info/puzz/trackprofiler/gui/GUIConstants.java
similarity index 100%
rename from trackprofiler/info/puzz/trackprofiler/gui/GUIConstants.java
rename to src/info/puzz/trackprofiler/gui/GUIConstants.java
diff --git a/trackprofiler/info/puzz/trackprofiler/gui/TrackProfilerFrame.java b/src/info/puzz/trackprofiler/gui/TrackProfilerFrame.java
similarity index 100%
rename from trackprofiler/info/puzz/trackprofiler/gui/TrackProfilerFrame.java
rename to src/info/puzz/trackprofiler/gui/TrackProfilerFrame.java
diff --git a/trackprofiler/info/puzz/trackprofiler/gui/TrackProfilerPreferencesDialog.java b/src/info/puzz/trackprofiler/gui/TrackProfilerPreferencesDialog.java
similarity index 100%
rename from trackprofiler/info/puzz/trackprofiler/gui/TrackProfilerPreferencesDialog.java
rename to src/info/puzz/trackprofiler/gui/TrackProfilerPreferencesDialog.java
diff --git a/trackprofiler/info/puzz/trackprofiler/gui/TrackTableModel.java b/src/info/puzz/trackprofiler/gui/TrackTableModel.java
similarity index 100%
rename from trackprofiler/info/puzz/trackprofiler/gui/TrackTableModel.java
rename to src/info/puzz/trackprofiler/gui/TrackTableModel.java
diff --git a/trackprofiler/info/puzz/trackprofiler/gui/WaypointsTable.java b/src/info/puzz/trackprofiler/gui/WaypointsTable.java
similarity index 100%
rename from trackprofiler/info/puzz/trackprofiler/gui/WaypointsTable.java
rename to src/info/puzz/trackprofiler/gui/WaypointsTable.java
diff --git a/trackprofiler/info/puzz/trackprofiler/gui/WaypointsTableModel.java b/src/info/puzz/trackprofiler/gui/WaypointsTableModel.java
similarity index 100%
rename from trackprofiler/info/puzz/trackprofiler/gui/WaypointsTableModel.java
rename to src/info/puzz/trackprofiler/gui/WaypointsTableModel.java
diff --git a/trackprofiler/info/puzz/trackprofiler/icons/brkpd_obj.gif b/src/info/puzz/trackprofiler/icons/brkpd_obj.gif
similarity index 100%
rename from trackprofiler/info/puzz/trackprofiler/icons/brkpd_obj.gif
rename to src/info/puzz/trackprofiler/icons/brkpd_obj.gif
diff --git a/trackprofiler/info/puzz/trackprofiler/icons/brkpi_obj.gif b/src/info/puzz/trackprofiler/icons/brkpi_obj.gif
similarity index 100%
rename from trackprofiler/info/puzz/trackprofiler/icons/brkpi_obj.gif
rename to src/info/puzz/trackprofiler/icons/brkpi_obj.gif
diff --git a/trackprofiler/info/puzz/trackprofiler/icons/ch_cancel.gif b/src/info/puzz/trackprofiler/icons/ch_cancel.gif
similarity index 100%
rename from trackprofiler/info/puzz/trackprofiler/icons/ch_cancel.gif
rename to src/info/puzz/trackprofiler/icons/ch_cancel.gif
diff --git a/trackprofiler/info/puzz/trackprofiler/icons/curve.gif b/src/info/puzz/trackprofiler/icons/curve.gif
similarity index 100%
rename from trackprofiler/info/puzz/trackprofiler/icons/curve.gif
rename to src/info/puzz/trackprofiler/icons/curve.gif
diff --git a/trackprofiler/info/puzz/trackprofiler/icons/delete_edit.gif b/src/info/puzz/trackprofiler/icons/delete_edit.gif
similarity index 100%
rename from trackprofiler/info/puzz/trackprofiler/icons/delete_edit.gif
rename to src/info/puzz/trackprofiler/icons/delete_edit.gif
diff --git a/trackprofiler/info/puzz/trackprofiler/icons/fldr_obj.gif b/src/info/puzz/trackprofiler/icons/fldr_obj.gif
similarity index 100%
rename from trackprofiler/info/puzz/trackprofiler/icons/fldr_obj.gif
rename to src/info/puzz/trackprofiler/icons/fldr_obj.gif
diff --git a/trackprofiler/info/puzz/trackprofiler/icons/help_contents.gif b/src/info/puzz/trackprofiler/icons/help_contents.gif
similarity index 100%
rename from trackprofiler/info/puzz/trackprofiler/icons/help_contents.gif
rename to src/info/puzz/trackprofiler/icons/help_contents.gif
diff --git a/trackprofiler/info/puzz/trackprofiler/icons/minimum.gif b/src/info/puzz/trackprofiler/icons/minimum.gif
similarity index 100%
rename from trackprofiler/info/puzz/trackprofiler/icons/minimum.gif
rename to src/info/puzz/trackprofiler/icons/minimum.gif
diff --git a/trackprofiler/info/puzz/trackprofiler/icons/ok_st_obj.gif b/src/info/puzz/trackprofiler/icons/ok_st_obj.gif
similarity index 100%
rename from trackprofiler/info/puzz/trackprofiler/icons/ok_st_obj.gif
rename to src/info/puzz/trackprofiler/icons/ok_st_obj.gif
diff --git a/trackprofiler/info/puzz/trackprofiler/icons/save_edit.gif b/src/info/puzz/trackprofiler/icons/save_edit.gif
similarity index 100%
rename from trackprofiler/info/puzz/trackprofiler/icons/save_edit.gif
rename to src/info/puzz/trackprofiler/icons/save_edit.gif
diff --git a/trackprofiler/info/puzz/trackprofiler/icons/undo_edit.gif b/src/info/puzz/trackprofiler/icons/undo_edit.gif
similarity index 100%
rename from trackprofiler/info/puzz/trackprofiler/icons/undo_edit.gif
rename to src/info/puzz/trackprofiler/icons/undo_edit.gif
diff --git a/trackprofiler/info/puzz/trackprofiler/temp/CHANGELOG.txt b/src/info/puzz/trackprofiler/temp/CHANGELOG.txt
similarity index 100%
rename from trackprofiler/info/puzz/trackprofiler/temp/CHANGELOG.txt
rename to src/info/puzz/trackprofiler/temp/CHANGELOG.txt
diff --git a/trackprofiler/info/puzz/trackprofiler/temp/TODO.txt b/src/info/puzz/trackprofiler/temp/TODO.txt
similarity index 100%
rename from trackprofiler/info/puzz/trackprofiler/temp/TODO.txt
rename to src/info/puzz/trackprofiler/temp/TODO.txt
diff --git a/trackprofiler/info/puzz/trackprofiler/util/Message.java b/src/info/puzz/trackprofiler/util/Message.java
similarity index 100%
rename from trackprofiler/info/puzz/trackprofiler/util/Message.java
rename to src/info/puzz/trackprofiler/util/Message.java
diff --git a/trackprofiler/info/puzz/trackprofiler/util/PropertiesService.java b/src/info/puzz/trackprofiler/util/PropertiesService.java
similarity index 100%
rename from trackprofiler/info/puzz/trackprofiler/util/PropertiesService.java
rename to src/info/puzz/trackprofiler/util/PropertiesService.java
diff --git a/trackprofiler/info/puzz/trackprofiler/util/ReplaceUtils.java b/src/info/puzz/trackprofiler/util/ReplaceUtils.java
similarity index 100%
rename from trackprofiler/info/puzz/trackprofiler/util/ReplaceUtils.java
rename to src/info/puzz/trackprofiler/util/ReplaceUtils.java
diff --git a/trackprofiler/info/puzz/trackprofiler/util/StringUtils.java b/src/info/puzz/trackprofiler/util/StringUtils.java
similarity index 100%
rename from trackprofiler/info/puzz/trackprofiler/util/StringUtils.java
rename to src/info/puzz/trackprofiler/util/StringUtils.java
diff --git a/trackprofiler/info/puzz/trackprofiler/util/TrackFileFilter.java b/src/info/puzz/trackprofiler/util/TrackFileFilter.java
similarity index 100%
rename from trackprofiler/info/puzz/trackprofiler/util/TrackFileFilter.java
rename to src/info/puzz/trackprofiler/util/TrackFileFilter.java
diff --git a/trackprofiler/info/puzz/trackprofiler/util/TrackProfilerMath.java b/src/info/puzz/trackprofiler/util/TrackProfilerMath.java
similarity index 100%
rename from trackprofiler/info/puzz/trackprofiler/util/TrackProfilerMath.java
rename to src/info/puzz/trackprofiler/util/TrackProfilerMath.java
diff --git a/trackprofiler/messages_en b/src/messages_en
similarity index 100%
rename from trackprofiler/messages_en
rename to src/messages_en
diff --git a/trackprofiler/messages_hr b/src/messages_hr
similarity index 100%
rename from trackprofiler/messages_hr
rename to src/messages_hr