diff --git a/data/armitage/armitage-src/build.xml b/external/source/armitage/build.xml
similarity index 100%
rename from data/armitage/armitage-src/build.xml
rename to external/source/armitage/build.xml
diff --git a/data/armitage/armitage-src/lib/jgraphx.jar b/external/source/armitage/lib/jgraphx.jar
similarity index 100%
rename from data/armitage/armitage-src/lib/jgraphx.jar
rename to external/source/armitage/lib/jgraphx.jar
diff --git a/data/armitage/armitage-src/lib/msgpack-0.5.1-devel.jar b/external/source/armitage/lib/msgpack-0.5.1-devel.jar
similarity index 100%
rename from data/armitage/armitage-src/lib/msgpack-0.5.1-devel.jar
rename to external/source/armitage/lib/msgpack-0.5.1-devel.jar
diff --git a/data/armitage/armitage-src/lib/postgresql-9.1-901.jdbc4.jar b/external/source/armitage/lib/postgresql-9.1-901.jdbc4.jar
similarity index 100%
rename from data/armitage/armitage-src/lib/postgresql-9.1-901.jdbc4.jar
rename to external/source/armitage/lib/postgresql-9.1-901.jdbc4.jar
diff --git a/data/armitage/armitage-src/lib/sleep.jar b/external/source/armitage/lib/sleep.jar
similarity index 100%
rename from data/armitage/armitage-src/lib/sleep.jar
rename to external/source/armitage/lib/sleep.jar
diff --git a/data/armitage/armitage-src/readme.txt b/external/source/armitage/readme.txt
similarity index 100%
rename from data/armitage/armitage-src/readme.txt
rename to external/source/armitage/readme.txt
diff --git a/data/armitage/armitage-src/resources/about.html b/external/source/armitage/resources/about.html
similarity index 100%
rename from data/armitage/armitage-src/resources/about.html
rename to external/source/armitage/resources/about.html
diff --git a/data/armitage/armitage-src/resources/armitage-icon.gif b/external/source/armitage/resources/armitage-icon.gif
similarity index 100%
rename from data/armitage/armitage-src/resources/armitage-icon.gif
rename to external/source/armitage/resources/armitage-icon.gif
diff --git a/data/armitage/armitage-src/resources/armitage-logo.gif b/external/source/armitage/resources/armitage-logo.gif
similarity index 100%
rename from data/armitage/armitage-src/resources/armitage-logo.gif
rename to external/source/armitage/resources/armitage-logo.gif
diff --git a/data/armitage/armitage-src/resources/armitage.prop b/external/source/armitage/resources/armitage.prop
similarity index 100%
rename from data/armitage/armitage-src/resources/armitage.prop
rename to external/source/armitage/resources/armitage.prop
diff --git a/data/armitage/armitage-src/resources/bsd.png b/external/source/armitage/resources/bsd.png
similarity index 100%
rename from data/armitage/armitage-src/resources/bsd.png
rename to external/source/armitage/resources/bsd.png
diff --git a/data/armitage/armitage-src/resources/cisco.png b/external/source/armitage/resources/cisco.png
similarity index 100%
rename from data/armitage/armitage-src/resources/cisco.png
rename to external/source/armitage/resources/cisco.png
diff --git a/data/armitage/armitage-src/resources/computer.png b/external/source/armitage/resources/computer.png
similarity index 100%
rename from data/armitage/armitage-src/resources/computer.png
rename to external/source/armitage/resources/computer.png
diff --git a/data/armitage/armitage-src/resources/error.txt b/external/source/armitage/resources/error.txt
similarity index 100%
rename from data/armitage/armitage-src/resources/error.txt
rename to external/source/armitage/resources/error.txt
diff --git a/data/armitage/armitage-src/resources/firewall.png b/external/source/armitage/resources/firewall.png
similarity index 100%
rename from data/armitage/armitage-src/resources/firewall.png
rename to external/source/armitage/resources/firewall.png
diff --git a/data/armitage/armitage-src/resources/hacked.png b/external/source/armitage/resources/hacked.png
similarity index 100%
rename from data/armitage/armitage-src/resources/hacked.png
rename to external/source/armitage/resources/hacked.png
diff --git a/data/armitage/armitage-src/resources/linux.png b/external/source/armitage/resources/linux.png
similarity index 100%
rename from data/armitage/armitage-src/resources/linux.png
rename to external/source/armitage/resources/linux.png
diff --git a/data/armitage/armitage-src/resources/macosx.png b/external/source/armitage/resources/macosx.png
similarity index 100%
rename from data/armitage/armitage-src/resources/macosx.png
rename to external/source/armitage/resources/macosx.png
diff --git a/data/armitage/armitage-src/resources/msfrpcd.bat b/external/source/armitage/resources/msfrpcd.bat
similarity index 100%
rename from data/armitage/armitage-src/resources/msfrpcd.bat
rename to external/source/armitage/resources/msfrpcd.bat
diff --git a/data/armitage/armitage-src/resources/printer.png b/external/source/armitage/resources/printer.png
similarity index 100%
rename from data/armitage/armitage-src/resources/printer.png
rename to external/source/armitage/resources/printer.png
diff --git a/data/armitage/armitage-src/resources/solaris.png b/external/source/armitage/resources/solaris.png
similarity index 100%
rename from data/armitage/armitage-src/resources/solaris.png
rename to external/source/armitage/resources/solaris.png
diff --git a/data/armitage/armitage-src/resources/unknown.png b/external/source/armitage/resources/unknown.png
similarity index 100%
rename from data/armitage/armitage-src/resources/unknown.png
rename to external/source/armitage/resources/unknown.png
diff --git a/data/armitage/armitage-src/resources/vmware.png b/external/source/armitage/resources/vmware.png
similarity index 100%
rename from data/armitage/armitage-src/resources/vmware.png
rename to external/source/armitage/resources/vmware.png
diff --git a/data/armitage/armitage-src/resources/windows2000.png b/external/source/armitage/resources/windows2000.png
similarity index 100%
rename from data/armitage/armitage-src/resources/windows2000.png
rename to external/source/armitage/resources/windows2000.png
diff --git a/data/armitage/armitage-src/resources/windows7.png b/external/source/armitage/resources/windows7.png
similarity index 100%
rename from data/armitage/armitage-src/resources/windows7.png
rename to external/source/armitage/resources/windows7.png
diff --git a/data/armitage/armitage-src/resources/windowsxp.png b/external/source/armitage/resources/windowsxp.png
similarity index 100%
rename from data/armitage/armitage-src/resources/windowsxp.png
rename to external/source/armitage/resources/windowsxp.png
diff --git a/data/armitage/armitage-src/run.sh b/external/source/armitage/run.sh
similarity index 100%
rename from data/armitage/armitage-src/run.sh
rename to external/source/armitage/run.sh
diff --git a/data/armitage/armitage-src/scripts/armitage.sl b/external/source/armitage/scripts/armitage.sl
similarity index 100%
rename from data/armitage/armitage-src/scripts/armitage.sl
rename to external/source/armitage/scripts/armitage.sl
diff --git a/data/armitage/armitage-src/scripts/attacks.sl b/external/source/armitage/scripts/attacks.sl
similarity index 100%
rename from data/armitage/armitage-src/scripts/attacks.sl
rename to external/source/armitage/scripts/attacks.sl
diff --git a/data/armitage/armitage-src/scripts/browser.sl b/external/source/armitage/scripts/browser.sl
similarity index 100%
rename from data/armitage/armitage-src/scripts/browser.sl
rename to external/source/armitage/scripts/browser.sl
diff --git a/data/armitage/armitage-src/scripts/collaborate.sl b/external/source/armitage/scripts/collaborate.sl
similarity index 100%
rename from data/armitage/armitage-src/scripts/collaborate.sl
rename to external/source/armitage/scripts/collaborate.sl
diff --git a/data/armitage/armitage-src/scripts/downloads.sl b/external/source/armitage/scripts/downloads.sl
similarity index 100%
rename from data/armitage/armitage-src/scripts/downloads.sl
rename to external/source/armitage/scripts/downloads.sl
diff --git a/data/armitage/armitage-src/scripts/gui.sl b/external/source/armitage/scripts/gui.sl
similarity index 100%
rename from data/armitage/armitage-src/scripts/gui.sl
rename to external/source/armitage/scripts/gui.sl
diff --git a/data/armitage/armitage-src/scripts/hosts.sl b/external/source/armitage/scripts/hosts.sl
similarity index 100%
rename from data/armitage/armitage-src/scripts/hosts.sl
rename to external/source/armitage/scripts/hosts.sl
diff --git a/data/armitage/armitage-src/scripts/jobs.sl b/external/source/armitage/scripts/jobs.sl
similarity index 100%
rename from data/armitage/armitage-src/scripts/jobs.sl
rename to external/source/armitage/scripts/jobs.sl
diff --git a/data/armitage/armitage-src/scripts/log.sl b/external/source/armitage/scripts/log.sl
similarity index 100%
rename from data/armitage/armitage-src/scripts/log.sl
rename to external/source/armitage/scripts/log.sl
diff --git a/data/armitage/armitage-src/scripts/loot.sl b/external/source/armitage/scripts/loot.sl
similarity index 100%
rename from data/armitage/armitage-src/scripts/loot.sl
rename to external/source/armitage/scripts/loot.sl
diff --git a/data/armitage/armitage-src/scripts/menus.sl b/external/source/armitage/scripts/menus.sl
similarity index 100%
rename from data/armitage/armitage-src/scripts/menus.sl
rename to external/source/armitage/scripts/menus.sl
diff --git a/data/armitage/armitage-src/scripts/meterpreter.sl b/external/source/armitage/scripts/meterpreter.sl
similarity index 100%
rename from data/armitage/armitage-src/scripts/meterpreter.sl
rename to external/source/armitage/scripts/meterpreter.sl
diff --git a/data/armitage/armitage-src/scripts/modules.sl b/external/source/armitage/scripts/modules.sl
similarity index 100%
rename from data/armitage/armitage-src/scripts/modules.sl
rename to external/source/armitage/scripts/modules.sl
diff --git a/data/armitage/armitage-src/scripts/passhash.sl b/external/source/armitage/scripts/passhash.sl
similarity index 100%
rename from data/armitage/armitage-src/scripts/passhash.sl
rename to external/source/armitage/scripts/passhash.sl
diff --git a/data/armitage/armitage-src/scripts/pivots.sl b/external/source/armitage/scripts/pivots.sl
similarity index 100%
rename from data/armitage/armitage-src/scripts/pivots.sl
rename to external/source/armitage/scripts/pivots.sl
diff --git a/data/armitage/armitage-src/scripts/preferences.sl b/external/source/armitage/scripts/preferences.sl
similarity index 100%
rename from data/armitage/armitage-src/scripts/preferences.sl
rename to external/source/armitage/scripts/preferences.sl
diff --git a/data/armitage/armitage-src/scripts/process.sl b/external/source/armitage/scripts/process.sl
similarity index 100%
rename from data/armitage/armitage-src/scripts/process.sl
rename to external/source/armitage/scripts/process.sl
diff --git a/data/armitage/armitage-src/scripts/reporting.sl b/external/source/armitage/scripts/reporting.sl
similarity index 100%
rename from data/armitage/armitage-src/scripts/reporting.sl
rename to external/source/armitage/scripts/reporting.sl
diff --git a/data/armitage/armitage-src/scripts/screenshot.sl b/external/source/armitage/scripts/screenshot.sl
similarity index 100%
rename from data/armitage/armitage-src/scripts/screenshot.sl
rename to external/source/armitage/scripts/screenshot.sl
diff --git a/data/armitage/armitage-src/scripts/server.sl b/external/source/armitage/scripts/server.sl
similarity index 100%
rename from data/armitage/armitage-src/scripts/server.sl
rename to external/source/armitage/scripts/server.sl
diff --git a/data/armitage/armitage-src/scripts/services.sl b/external/source/armitage/scripts/services.sl
similarity index 100%
rename from data/armitage/armitage-src/scripts/services.sl
rename to external/source/armitage/scripts/services.sl
diff --git a/data/armitage/armitage-src/scripts/shell.sl b/external/source/armitage/scripts/shell.sl
similarity index 100%
rename from data/armitage/armitage-src/scripts/shell.sl
rename to external/source/armitage/scripts/shell.sl
diff --git a/data/armitage/armitage-src/scripts/targets.sl b/external/source/armitage/scripts/targets.sl
similarity index 100%
rename from data/armitage/armitage-src/scripts/targets.sl
rename to external/source/armitage/scripts/targets.sl
diff --git a/data/armitage/armitage-src/scripts/tokens.sl b/external/source/armitage/scripts/tokens.sl
similarity index 100%
rename from data/armitage/armitage-src/scripts/tokens.sl
rename to external/source/armitage/scripts/tokens.sl
diff --git a/data/armitage/armitage-src/scripts/util.sl b/external/source/armitage/scripts/util.sl
similarity index 100%
rename from data/armitage/armitage-src/scripts/util.sl
rename to external/source/armitage/scripts/util.sl
diff --git a/data/armitage/armitage-src/scripts/workspaces.sl b/external/source/armitage/scripts/workspaces.sl
similarity index 100%
rename from data/armitage/armitage-src/scripts/workspaces.sl
rename to external/source/armitage/scripts/workspaces.sl
diff --git a/data/armitage/armitage-src/src/armitage/Activity.java b/external/source/armitage/src/armitage/Activity.java
similarity index 100%
rename from data/armitage/armitage-src/src/armitage/Activity.java
rename to external/source/armitage/src/armitage/Activity.java
diff --git a/data/armitage/armitage-src/src/armitage/ActivityConsole.java b/external/source/armitage/src/armitage/ActivityConsole.java
similarity index 100%
rename from data/armitage/armitage-src/src/armitage/ActivityConsole.java
rename to external/source/armitage/src/armitage/ActivityConsole.java
diff --git a/data/armitage/armitage-src/src/armitage/ArmitageApplication.java b/external/source/armitage/src/armitage/ArmitageApplication.java
similarity index 100%
rename from data/armitage/armitage-src/src/armitage/ArmitageApplication.java
rename to external/source/armitage/src/armitage/ArmitageApplication.java
diff --git a/data/armitage/armitage-src/src/armitage/ArmitageMain.java b/external/source/armitage/src/armitage/ArmitageMain.java
similarity index 100%
rename from data/armitage/armitage-src/src/armitage/ArmitageMain.java
rename to external/source/armitage/src/armitage/ArmitageMain.java
diff --git a/data/armitage/armitage-src/src/armitage/ArmitageThread.java b/external/source/armitage/src/armitage/ArmitageThread.java
similarity index 100%
rename from data/armitage/armitage-src/src/armitage/ArmitageThread.java
rename to external/source/armitage/src/armitage/ArmitageThread.java
diff --git a/data/armitage/armitage-src/src/armitage/ArmitageThreadClient.java b/external/source/armitage/src/armitage/ArmitageThreadClient.java
similarity index 100%
rename from data/armitage/armitage-src/src/armitage/ArmitageThreadClient.java
rename to external/source/armitage/src/armitage/ArmitageThreadClient.java
diff --git a/data/armitage/armitage-src/src/armitage/ArmitageTimer.java b/external/source/armitage/src/armitage/ArmitageTimer.java
similarity index 100%
rename from data/armitage/armitage-src/src/armitage/ArmitageTimer.java
rename to external/source/armitage/src/armitage/ArmitageTimer.java
diff --git a/data/armitage/armitage-src/src/armitage/ArmitageTimerClient.java b/external/source/armitage/src/armitage/ArmitageTimerClient.java
similarity index 100%
rename from data/armitage/armitage-src/src/armitage/ArmitageTimerClient.java
rename to external/source/armitage/src/armitage/ArmitageTimerClient.java
diff --git a/data/armitage/armitage-src/src/armitage/ConsoleCallback.java b/external/source/armitage/src/armitage/ConsoleCallback.java
similarity index 100%
rename from data/armitage/armitage-src/src/armitage/ConsoleCallback.java
rename to external/source/armitage/src/armitage/ConsoleCallback.java
diff --git a/data/armitage/armitage-src/src/armitage/ConsoleClient.java b/external/source/armitage/src/armitage/ConsoleClient.java
similarity index 100%
rename from data/armitage/armitage-src/src/armitage/ConsoleClient.java
rename to external/source/armitage/src/armitage/ConsoleClient.java
diff --git a/data/armitage/armitage-src/src/armitage/ConsoleQueue.java b/external/source/armitage/src/armitage/ConsoleQueue.java
similarity index 100%
rename from data/armitage/armitage-src/src/armitage/ConsoleQueue.java
rename to external/source/armitage/src/armitage/ConsoleQueue.java
diff --git a/data/armitage/armitage-src/src/armitage/GenericTabCompletion.java b/external/source/armitage/src/armitage/GenericTabCompletion.java
similarity index 100%
rename from data/armitage/armitage-src/src/armitage/GenericTabCompletion.java
rename to external/source/armitage/src/armitage/GenericTabCompletion.java
diff --git a/data/armitage/armitage-src/src/armitage/MeterpreterClient.java b/external/source/armitage/src/armitage/MeterpreterClient.java
similarity index 100%
rename from data/armitage/armitage-src/src/armitage/MeterpreterClient.java
rename to external/source/armitage/src/armitage/MeterpreterClient.java
diff --git a/data/armitage/armitage-src/src/armitage/QueueTabCompletion.java b/external/source/armitage/src/armitage/QueueTabCompletion.java
similarity index 100%
rename from data/armitage/armitage-src/src/armitage/QueueTabCompletion.java
rename to external/source/armitage/src/armitage/QueueTabCompletion.java
diff --git a/data/armitage/armitage-src/src/armitage/SimpleTimer.java b/external/source/armitage/src/armitage/SimpleTimer.java
similarity index 100%
rename from data/armitage/armitage-src/src/armitage/SimpleTimer.java
rename to external/source/armitage/src/armitage/SimpleTimer.java
diff --git a/data/armitage/armitage-src/src/armitage/TabCompletion.java b/external/source/armitage/src/armitage/TabCompletion.java
similarity index 100%
rename from data/armitage/armitage-src/src/armitage/TabCompletion.java
rename to external/source/armitage/src/armitage/TabCompletion.java
diff --git a/data/armitage/armitage-src/src/console/Console.java b/external/source/armitage/src/console/Console.java
similarity index 100%
rename from data/armitage/armitage-src/src/console/Console.java
rename to external/source/armitage/src/console/Console.java
diff --git a/data/armitage/armitage-src/src/console/ConsolePopup.java b/external/source/armitage/src/console/ConsolePopup.java
similarity index 100%
rename from data/armitage/armitage-src/src/console/ConsolePopup.java
rename to external/source/armitage/src/console/ConsolePopup.java
diff --git a/data/armitage/armitage-src/src/console/Display.java b/external/source/armitage/src/console/Display.java
similarity index 100%
rename from data/armitage/armitage-src/src/console/Display.java
rename to external/source/armitage/src/console/Display.java
diff --git a/data/armitage/armitage-src/src/console/SearchPanel.java b/external/source/armitage/src/console/SearchPanel.java
similarity index 100%
rename from data/armitage/armitage-src/src/console/SearchPanel.java
rename to external/source/armitage/src/console/SearchPanel.java
diff --git a/data/armitage/armitage-src/src/graph/CircleLayout.java b/external/source/armitage/src/graph/CircleLayout.java
similarity index 100%
rename from data/armitage/armitage-src/src/graph/CircleLayout.java
rename to external/source/armitage/src/graph/CircleLayout.java
diff --git a/data/armitage/armitage-src/src/graph/GraphPopup.java b/external/source/armitage/src/graph/GraphPopup.java
similarity index 100%
rename from data/armitage/armitage-src/src/graph/GraphPopup.java
rename to external/source/armitage/src/graph/GraphPopup.java
diff --git a/data/armitage/armitage-src/src/graph/NetworkGraph.java b/external/source/armitage/src/graph/NetworkGraph.java
similarity index 100%
rename from data/armitage/armitage-src/src/graph/NetworkGraph.java
rename to external/source/armitage/src/graph/NetworkGraph.java
diff --git a/data/armitage/armitage-src/src/graph/Route.java b/external/source/armitage/src/graph/Route.java
similarity index 100%
rename from data/armitage/armitage-src/src/graph/Route.java
rename to external/source/armitage/src/graph/Route.java
diff --git a/data/armitage/armitage-src/src/graph/TouchList.java b/external/source/armitage/src/graph/TouchList.java
similarity index 100%
rename from data/armitage/armitage-src/src/graph/TouchList.java
rename to external/source/armitage/src/graph/TouchList.java
diff --git a/data/armitage/armitage-src/src/graph/TouchMap.java b/external/source/armitage/src/graph/TouchMap.java
similarity index 100%
rename from data/armitage/armitage-src/src/graph/TouchMap.java
rename to external/source/armitage/src/graph/TouchMap.java
diff --git a/data/armitage/armitage-src/src/msf/Async.java b/external/source/armitage/src/msf/Async.java
similarity index 100%
rename from data/armitage/armitage-src/src/msf/Async.java
rename to external/source/armitage/src/msf/Async.java
diff --git a/data/armitage/armitage-src/src/msf/Base64.java b/external/source/armitage/src/msf/Base64.java
similarity index 100%
rename from data/armitage/armitage-src/src/msf/Base64.java
rename to external/source/armitage/src/msf/Base64.java
diff --git a/data/armitage/armitage-src/src/msf/ConsolePool.java b/external/source/armitage/src/msf/ConsolePool.java
similarity index 100%
rename from data/armitage/armitage-src/src/msf/ConsolePool.java
rename to external/source/armitage/src/msf/ConsolePool.java
diff --git a/data/armitage/armitage-src/src/msf/DatabaseImpl.java b/external/source/armitage/src/msf/DatabaseImpl.java
similarity index 100%
rename from data/armitage/armitage-src/src/msf/DatabaseImpl.java
rename to external/source/armitage/src/msf/DatabaseImpl.java
diff --git a/data/armitage/armitage-src/src/msf/MeterpreterSession.java b/external/source/armitage/src/msf/MeterpreterSession.java
similarity index 100%
rename from data/armitage/armitage-src/src/msf/MeterpreterSession.java
rename to external/source/armitage/src/msf/MeterpreterSession.java
diff --git a/data/armitage/armitage-src/src/msf/MsgRpcImpl.java b/external/source/armitage/src/msf/MsgRpcImpl.java
similarity index 100%
rename from data/armitage/armitage-src/src/msf/MsgRpcImpl.java
rename to external/source/armitage/src/msf/MsgRpcImpl.java
diff --git a/data/armitage/armitage-src/src/msf/RpcAsync.java b/external/source/armitage/src/msf/RpcAsync.java
similarity index 100%
rename from data/armitage/armitage-src/src/msf/RpcAsync.java
rename to external/source/armitage/src/msf/RpcAsync.java
diff --git a/data/armitage/armitage-src/src/msf/RpcCacheImpl.java b/external/source/armitage/src/msf/RpcCacheImpl.java
similarity index 100%
rename from data/armitage/armitage-src/src/msf/RpcCacheImpl.java
rename to external/source/armitage/src/msf/RpcCacheImpl.java
diff --git a/data/armitage/armitage-src/src/msf/RpcConnection.java b/external/source/armitage/src/msf/RpcConnection.java
similarity index 100%
rename from data/armitage/armitage-src/src/msf/RpcConnection.java
rename to external/source/armitage/src/msf/RpcConnection.java
diff --git a/data/armitage/armitage-src/src/msf/RpcConnectionImpl.java b/external/source/armitage/src/msf/RpcConnectionImpl.java
similarity index 100%
rename from data/armitage/armitage-src/src/msf/RpcConnectionImpl.java
rename to external/source/armitage/src/msf/RpcConnectionImpl.java
diff --git a/data/armitage/armitage-src/src/msf/RpcQueue.java b/external/source/armitage/src/msf/RpcQueue.java
similarity index 100%
rename from data/armitage/armitage-src/src/msf/RpcQueue.java
rename to external/source/armitage/src/msf/RpcQueue.java
diff --git a/data/armitage/armitage-src/src/msf/SecureSocket.java b/external/source/armitage/src/msf/SecureSocket.java
similarity index 100%
rename from data/armitage/armitage-src/src/msf/SecureSocket.java
rename to external/source/armitage/src/msf/SecureSocket.java
diff --git a/data/armitage/armitage-src/src/table/GenericTableModel.java b/external/source/armitage/src/table/GenericTableModel.java
similarity index 100%
rename from data/armitage/armitage-src/src/table/GenericTableModel.java
rename to external/source/armitage/src/table/GenericTableModel.java
diff --git a/data/armitage/armitage-src/src/table/NetworkTable.java b/external/source/armitage/src/table/NetworkTable.java
similarity index 100%
rename from data/armitage/armitage-src/src/table/NetworkTable.java
rename to external/source/armitage/src/table/NetworkTable.java
diff --git a/data/armitage/armitage-src/src/tree/SimpleTreeNode.java b/external/source/armitage/src/tree/SimpleTreeNode.java
similarity index 100%
rename from data/armitage/armitage-src/src/tree/SimpleTreeNode.java
rename to external/source/armitage/src/tree/SimpleTreeNode.java
diff --git a/data/armitage/armitage-src/src/ui/ATable.java b/external/source/armitage/src/ui/ATable.java
similarity index 100%
rename from data/armitage/armitage-src/src/ui/ATable.java
rename to external/source/armitage/src/ui/ATable.java
diff --git a/data/armitage/armitage-src/src/ui/ATextField.java b/external/source/armitage/src/ui/ATextField.java
similarity index 100%
rename from data/armitage/armitage-src/src/ui/ATextField.java
rename to external/source/armitage/src/ui/ATextField.java
diff --git a/data/armitage/armitage-src/src/ui/ATree.java b/external/source/armitage/src/ui/ATree.java
similarity index 100%
rename from data/armitage/armitage-src/src/ui/ATree.java
rename to external/source/armitage/src/ui/ATree.java
diff --git a/data/armitage/armitage-src/src/ui/CopyPopup.java b/external/source/armitage/src/ui/CopyPopup.java
similarity index 100%
rename from data/armitage/armitage-src/src/ui/CopyPopup.java
rename to external/source/armitage/src/ui/CopyPopup.java
diff --git a/data/armitage/armitage-src/src/ui/CutCopyPastePopup.java b/external/source/armitage/src/ui/CutCopyPastePopup.java
similarity index 100%
rename from data/armitage/armitage-src/src/ui/CutCopyPastePopup.java
rename to external/source/armitage/src/ui/CutCopyPastePopup.java
diff --git a/data/armitage/armitage-src/src/ui/DraggableTabbedPane.java b/external/source/armitage/src/ui/DraggableTabbedPane.java
similarity index 100%
rename from data/armitage/armitage-src/src/ui/DraggableTabbedPane.java
rename to external/source/armitage/src/ui/DraggableTabbedPane.java
diff --git a/data/armitage/armitage-src/src/ui/DynamicMenu.java b/external/source/armitage/src/ui/DynamicMenu.java
similarity index 100%
rename from data/armitage/armitage-src/src/ui/DynamicMenu.java
rename to external/source/armitage/src/ui/DynamicMenu.java
diff --git a/data/armitage/armitage-src/src/ui/KeyBindings.java b/external/source/armitage/src/ui/KeyBindings.java
similarity index 100%
rename from data/armitage/armitage-src/src/ui/KeyBindings.java
rename to external/source/armitage/src/ui/KeyBindings.java
diff --git a/data/armitage/armitage-src/src/ui/KeyHandler.java b/external/source/armitage/src/ui/KeyHandler.java
similarity index 100%
rename from data/armitage/armitage-src/src/ui/KeyHandler.java
rename to external/source/armitage/src/ui/KeyHandler.java
diff --git a/data/armitage/armitage-src/src/ui/ModuleTransferHandler.java b/external/source/armitage/src/ui/ModuleTransferHandler.java
similarity index 100%
rename from data/armitage/armitage-src/src/ui/ModuleTransferHandler.java
rename to external/source/armitage/src/ui/ModuleTransferHandler.java
diff --git a/data/armitage/armitage-src/src/ui/SafeMouseListener.java b/external/source/armitage/src/ui/SafeMouseListener.java
similarity index 100%
rename from data/armitage/armitage-src/src/ui/SafeMouseListener.java
rename to external/source/armitage/src/ui/SafeMouseListener.java
diff --git a/data/armitage/armitage-src/src/ui/ScreenshotManager.java b/external/source/armitage/src/ui/ScreenshotManager.java
similarity index 100%
rename from data/armitage/armitage-src/src/ui/ScreenshotManager.java
rename to external/source/armitage/src/ui/ScreenshotManager.java
diff --git a/data/armitage/armitage-src/src/ui/ZoomableImage.java b/external/source/armitage/src/ui/ZoomableImage.java
similarity index 100%
rename from data/armitage/armitage-src/src/ui/ZoomableImage.java
rename to external/source/armitage/src/ui/ZoomableImage.java
diff --git a/data/armitage/armitage-src/whatsnew.txt b/external/source/armitage/whatsnew.txt
similarity index 100%
rename from data/armitage/armitage-src/whatsnew.txt
rename to external/source/armitage/whatsnew.txt