Added GPL license header to source code; updated readme; removed disk images from installer package. Removed pcap folder from project

Contralto/AltoSystem.cs

@@ -1,10 +1,26 @@
-using System.Collections.Generic;
+/*  
+    This file is part of ContrAlto.
+
+    ContrAlto is free software: you can redistribute it and/or modify
+    it under the terms of the GNU General Public License as published by
+    the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+
+    ContrAlto is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU General Public License for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with ContrAlto.  If not, see <http://www.gnu.org/licenses/>.
+*/
+
+using System.Collections.Generic;
 
 using Contralto.CPU;
 using Contralto.IO;
 using Contralto.Memory;
 using Contralto.Display;
-using System.Timers;
 using System.IO;
 using System;
 

Contralto/CPU/ALU.cs

@@ -1,4 +1,21 @@
-using System;
+/*  
+    This file is part of ContrAlto.
+
+    ContrAlto is free software: you can redistribute it and/or modify
+    it under the terms of the GNU General Public License as published by
+    the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+
+    ContrAlto is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU General Public License for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with ContrAlto.  If not, see <http://www.gnu.org/licenses/>.
+*/
+
+using System;
 
 namespace Contralto.CPU
 {

Contralto/CPU/CPU.cs

@@ -1,4 +1,21 @@
-using System.Timers;
+/*  
+    This file is part of ContrAlto.
+
+    ContrAlto is free software: you can redistribute it and/or modify
+    it under the terms of the GNU General Public License as published by
+    the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+
+    ContrAlto is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU General Public License for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with ContrAlto.  If not, see <http://www.gnu.org/licenses/>.
+*/
+
+using System.Timers;
 
 using Contralto.Logging;
 

Contralto/CPU/ConstantMemory.cs

@@ -1,4 +1,21 @@
-using System;
+/*  
+    This file is part of ContrAlto.
+
+    ContrAlto is free software: you can redistribute it and/or modify
+    it under the terms of the GNU General Public License as published by
+    the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+
+    ContrAlto is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU General Public License for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with ContrAlto.  If not, see <http://www.gnu.org/licenses/>.
+*/
+
+using System;
 using System.IO;
 
 namespace Contralto.CPU

Contralto/CPU/MicroInstruction.cs

@@ -1,4 +1,21 @@
-using Contralto.Memory;
+/*  
+    This file is part of ContrAlto.
+
+    ContrAlto is free software: you can redistribute it and/or modify
+    it under the terms of the GNU General Public License as published by
+    the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+
+    ContrAlto is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU General Public License for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with ContrAlto.  If not, see <http://www.gnu.org/licenses/>.
+*/
+
+using Contralto.Memory;
 using System;
 
 namespace Contralto.CPU

Contralto/CPU/NovaDisassembler.cs

@@ -1,4 +1,21 @@
-using System;
+/*  
+    This file is part of ContrAlto.
+
+    ContrAlto is free software: you can redistribute it and/or modify
+    it under the terms of the GNU General Public License as published by
+    the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+
+    ContrAlto is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU General Public License for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with ContrAlto.  If not, see <http://www.gnu.org/licenses/>.
+*/
+
+using System;
 using System.Collections.Generic;
 using System.Text;
 

Contralto/CPU/Shifter.cs

@@ -1,4 +1,21 @@
-using System;
+/*  
+    This file is part of ContrAlto.
+
+    ContrAlto is free software: you can redistribute it and/or modify
+    it under the terms of the GNU General Public License as published by
+    the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+
+    ContrAlto is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU General Public License for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with ContrAlto.  If not, see <http://www.gnu.org/licenses/>.
+*/
+
+using System;
 
 namespace Contralto.CPU
 {

Contralto/CPU/Tasks/CursorTask.cs

@@ -1,4 +1,20 @@
-using System;
+/*  
+    This file is part of ContrAlto.
+
+    ContrAlto is free software: you can redistribute it and/or modify
+    it under the terms of the GNU General Public License as published by
+    the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+
+    ContrAlto is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU General Public License for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with ContrAlto.  If not, see <http://www.gnu.org/licenses/>.
+*/
+using System;
 
 namespace Contralto.CPU
 {

Contralto/CPU/Tasks/DiskTask.cs

@@ -1,4 +1,21 @@
-using Contralto.IO;
+/*  
+    This file is part of ContrAlto.
+
+    ContrAlto is free software: you can redistribute it and/or modify
+    it under the terms of the GNU General Public License as published by
+    the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+
+    ContrAlto is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU General Public License for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with ContrAlto.  If not, see <http://www.gnu.org/licenses/>.
+*/
+
+using Contralto.IO;
 using Contralto.Logging;
 using System;
 

Contralto/CPU/Tasks/DisplayHorizontalTask.cs

@@ -1,4 +1,21 @@
-using Contralto.Display;
+/*  
+    This file is part of ContrAlto.
+
+    ContrAlto is free software: you can redistribute it and/or modify
+    it under the terms of the GNU General Public License as published by
+    the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+
+    ContrAlto is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU General Public License for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with ContrAlto.  If not, see <http://www.gnu.org/licenses/>.
+*/
+
+using Contralto.Display;
 using System;
 
 namespace Contralto.CPU

Contralto/CPU/Tasks/DisplayVerticalTask.cs

@@ -1,4 +1,21 @@
-using Contralto.Display;
+/*  
+    This file is part of ContrAlto.
+
+    ContrAlto is free software: you can redistribute it and/or modify
+    it under the terms of the GNU General Public License as published by
+    the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+
+    ContrAlto is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU General Public License for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with ContrAlto.  If not, see <http://www.gnu.org/licenses/>.
+*/
+
+using Contralto.Display;
 using System;
 
 namespace Contralto.CPU

Contralto/CPU/Tasks/DisplayWordTask.cs

@@ -1,4 +1,21 @@
-using Contralto.Display;
+/*  
+    This file is part of ContrAlto.
+
+    ContrAlto is free software: you can redistribute it and/or modify
+    it under the terms of the GNU General Public License as published by
+    the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+
+    ContrAlto is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU General Public License for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with ContrAlto.  If not, see <http://www.gnu.org/licenses/>.
+*/
+
+using Contralto.Display;
 using System;
 
 

Contralto/CPU/Tasks/EmulatorTask.cs

@@ -1,4 +1,21 @@
-using Contralto.Logging;
+/*  
+    This file is part of ContrAlto.
+
+    ContrAlto is free software: you can redistribute it and/or modify
+    it under the terms of the GNU General Public License as published by
+    the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+
+    ContrAlto is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU General Public License for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with ContrAlto.  If not, see <http://www.gnu.org/licenses/>.
+*/
+
+using Contralto.Logging;
 using System;
 
 namespace Contralto.CPU

Contralto/CPU/Tasks/EthernetTask.cs

@@ -1,4 +1,21 @@
-using Contralto.IO;
+/*  
+    This file is part of ContrAlto.
+
+    ContrAlto is free software: you can redistribute it and/or modify
+    it under the terms of the GNU General Public License as published by
+    the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+
+    ContrAlto is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU General Public License for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with ContrAlto.  If not, see <http://www.gnu.org/licenses/>.
+*/
+
+using Contralto.IO;
 using Contralto.Logging;
 using System;
 

Contralto/CPU/Tasks/MemoryRefreshTask.cs

@@ -1,4 +1,21 @@
-namespace Contralto.CPU
+/*  
+    This file is part of ContrAlto.
+
+    ContrAlto is free software: you can redistribute it and/or modify
+    it under the terms of the GNU General Public License as published by
+    the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+
+    ContrAlto is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU General Public License for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with ContrAlto.  If not, see <http://www.gnu.org/licenses/>.
+*/
+
+namespace Contralto.CPU
 {
     public partial class AltoCPU
     {

Contralto/CPU/Tasks/ParityTask.cs

@@ -1,4 +1,21 @@
-using System;
+/*  
+    This file is part of ContrAlto.
+
+    ContrAlto is free software: you can redistribute it and/or modify
+    it under the terms of the GNU General Public License as published by
+    the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+
+    ContrAlto is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU General Public License for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with ContrAlto.  If not, see <http://www.gnu.org/licenses/>.
+*/
+
+using System;
 
 namespace Contralto.CPU
 {

Contralto/CPU/Tasks/Task.cs

@@ -1,4 +1,21 @@
-using System;
+/*  
+    This file is part of ContrAlto.
+
+    ContrAlto is free software: you can redistribute it and/or modify
+    it under the terms of the GNU General Public License as published by
+    the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+
+    ContrAlto is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU General Public License for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with ContrAlto.  If not, see <http://www.gnu.org/licenses/>.
+*/
+
+using System;
 
 using Contralto.Memory;
 using Contralto.Logging;

Contralto/CPU/UCodeDisassembler.cs

@@ -1,4 +1,21 @@
-using System;
+/*  
+    This file is part of ContrAlto.
+
+    ContrAlto is free software: you can redistribute it and/or modify
+    it under the terms of the GNU General Public License as published by
+    the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+
+    ContrAlto is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU General Public License for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with ContrAlto.  If not, see <http://www.gnu.org/licenses/>.
+*/
+
+using System;
 using System.Text;
 
 namespace Contralto.CPU

Contralto/CPU/UCodeMemory.cs

@@ -1,4 +1,21 @@
-using Contralto.Logging;
+/*  
+    This file is part of ContrAlto.
+
+    ContrAlto is free software: you can redistribute it and/or modify
+    it under the terms of the GNU General Public License as published by
+    the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+
+    ContrAlto is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU General Public License for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with ContrAlto.  If not, see <http://www.gnu.org/licenses/>.
+*/
+
+using Contralto.Logging;
 using System;
 using System.IO;
 

Contralto/Configuration.cs

@@ -1,10 +1,23 @@
-using Contralto.Logging;
+/*  
+    This file is part of ContrAlto.
+
+    ContrAlto is free software: you can redistribute it and/or modify
+    it under the terms of the GNU General Public License as published by
+    the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+
+    ContrAlto is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU General Public License for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with ContrAlto.  If not, see <http://www.gnu.org/licenses/>.
+*/
+
+using Contralto.Logging;
 using System;
-using System.Collections.Generic;
 using System.IO;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
 
 namespace Contralto
 {

Contralto/Contralto.csproj

@@ -462,18 +462,6 @@
     <None Include="Resources\DiskNoAccess.bmp" />
     <None Include="Resources\dragon.png" />
     <EmbeddedResource Include="dragon.png" />
-    <Content Include="pcap\PcapDotNet.Base.dll" />
-    <Content Include="pcap\PcapDotNet.Base.pdb" />
-    <Content Include="pcap\PcapDotNet.Base.xml" />
-    <Content Include="pcap\PcapDotNet.Core.dll" />
-    <Content Include="pcap\PcapDotNet.Core.Extensions.dll" />
-    <Content Include="pcap\PcapDotNet.Core.Extensions.pdb" />
-    <Content Include="pcap\PcapDotNet.Core.Extensions.XML" />
-    <Content Include="pcap\PcapDotNet.Core.pdb" />
-    <Content Include="pcap\PcapDotNet.Core.xml" />
-    <Content Include="pcap\PcapDotNet.Packets.dll" />
-    <Content Include="pcap\PcapDotNet.Packets.pdb" />
-    <Content Include="pcap\PcapDotNet.Packets.xml" />
     <Content Include="readme.txt">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </Content>

Contralto/Conversion.cs

@@ -1,4 +1,21 @@
-using System;
+/*  
+    This file is part of ContrAlto.
+
+    ContrAlto is free software: you can redistribute it and/or modify
+    it under the terms of the GNU General Public License as published by
+    the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+
+    ContrAlto is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU General Public License for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with ContrAlto.  If not, see <http://www.gnu.org/licenses/>.
+*/
+
+using System;
 
 namespace Contralto
 {

Contralto/Display/DisplayController.cs

@@ -1,4 +1,21 @@
-using System.Collections.Generic;
+/*  
+    This file is part of ContrAlto.
+
+    ContrAlto is free software: you can redistribute it and/or modify
+    it under the terms of the GNU General Public License as published by
+    the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+
+    ContrAlto is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU General Public License for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with ContrAlto.  If not, see <http://www.gnu.org/licenses/>.
+*/
+
+using System.Collections.Generic;
 using Contralto.CPU;
 
 namespace Contralto.Display

Contralto/Display/IAltoDisplay.cs

@@ -1,4 +1,21 @@
-using System;
+/*  
+    This file is part of ContrAlto.
+
+    ContrAlto is free software: you can redistribute it and/or modify
+    it under the terms of the GNU General Public License as published by
+    the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+
+    ContrAlto is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU General Public License for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with ContrAlto.  If not, see <http://www.gnu.org/licenses/>.
+*/
+
+using System;
 using System.Collections.Generic;
 using System.Linq;
 using System.Text;

Contralto/ExecutionController.cs

@@ -1,9 +1,22 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
+/*  
+    This file is part of ContrAlto.
+
+    ContrAlto is free software: you can redistribute it and/or modify
+    it under the terms of the GNU General Public License as published by
+    the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+
+    ContrAlto is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU General Public License for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with ContrAlto.  If not, see <http://www.gnu.org/licenses/>.
+*/
+
+using System;
 using System.Threading;
-using System.Threading.Tasks;
 
 namespace Contralto
 {

Contralto/HighResTimer.cs

@@ -1,4 +1,21 @@
-using System;
+/*  
+    This file is part of ContrAlto.
+
+    ContrAlto is free software: you can redistribute it and/or modify
+    it under the terms of the GNU General Public License as published by
+    the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+
+    ContrAlto is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU General Public License for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with ContrAlto.  If not, see <http://www.gnu.org/licenses/>.
+*/
+
+using System;
 using System.ComponentModel;
 using System.Runtime.InteropServices;
 using System.Threading;

Contralto/IClockable.cs

@@ -1,4 +1,21 @@
-namespace Contralto
+/*  
+    This file is part of ContrAlto.
+
+    ContrAlto is free software: you can redistribute it and/or modify
+    it under the terms of the GNU General Public License as published by
+    the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+
+    ContrAlto is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU General Public License for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with ContrAlto.  If not, see <http://www.gnu.org/licenses/>.
+*/
+
+namespace Contralto
 {
     /// <summary>
     /// Used by classes implementing devices that are clocked (i.e. that are dependent

Contralto/IO/DiabloDrive.cs

@@ -1,4 +1,21 @@
-using Contralto.Logging;
+/*  
+    This file is part of ContrAlto.
+
+    ContrAlto is free software: you can redistribute it and/or modify
+    it under the terms of the GNU General Public License as published by
+    the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+
+    ContrAlto is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU General Public License for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with ContrAlto.  If not, see <http://www.gnu.org/licenses/>.
+*/
+
+using Contralto.Logging;
 using System;
 using System.Collections.Generic;
 using System.IO;

Contralto/IO/DiabloPack.cs

@@ -1,4 +1,21 @@
-using System;
+/*  
+    This file is part of ContrAlto.
+
+    ContrAlto is free software: you can redistribute it and/or modify
+    it under the terms of the GNU General Public License as published by
+    the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+
+    ContrAlto is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU General Public License for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with ContrAlto.  If not, see <http://www.gnu.org/licenses/>.
+*/
+
+using System;
 using System.IO;
 
 namespace Contralto.IO

Contralto/IO/DiskController.cs

@@ -1,4 +1,21 @@
-using System;
+/*  
+    This file is part of ContrAlto.
+
+    ContrAlto is free software: you can redistribute it and/or modify
+    it under the terms of the GNU General Public License as published by
+    the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+
+    ContrAlto is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU General Public License for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with ContrAlto.  If not, see <http://www.gnu.org/licenses/>.
+*/
+
+using System;
 using System.IO;
 using Contralto.Logging;
 using Contralto.CPU;

Contralto/IO/EthernetController.cs

@@ -1,4 +1,21 @@
-using Contralto.CPU;
+/*  
+    This file is part of ContrAlto.
+
+    ContrAlto is free software: you can redistribute it and/or modify
+    it under the terms of the GNU General Public License as published by
+    the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+
+    ContrAlto is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU General Public License for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with ContrAlto.  If not, see <http://www.gnu.org/licenses/>.
+*/
+
+using Contralto.CPU;
 using Contralto.Logging;
 using System;
 using System.Collections.Generic;

Contralto/IO/HostEthernetEncapsulation.cs

@@ -1,4 +1,21 @@
-using System;
+/*  
+    This file is part of ContrAlto.
+
+    ContrAlto is free software: you can redistribute it and/or modify
+    it under the terms of the GNU General Public License as published by
+    the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+
+    ContrAlto is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU General Public License for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with ContrAlto.  If not, see <http://www.gnu.org/licenses/>.
+*/
+
+using System;
 using System.Collections.Generic;
 using System.Linq;
 using System.Text;

Contralto/IO/IPacketEncapsulation.cs

@@ -1,4 +1,21 @@
-using System.IO;
+/*  
+    This file is part of ContrAlto.
+
+    ContrAlto is free software: you can redistribute it and/or modify
+    it under the terms of the GNU General Public License as published by
+    the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+
+    ContrAlto is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU General Public License for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with ContrAlto.  If not, see <http://www.gnu.org/licenses/>.
+*/
+
+using System.IO;
 
 
 namespace Contralto.IO

Contralto/IO/Keyboard.cs

@@ -1,4 +1,21 @@
-using System.Collections.Generic;
+/*  
+    This file is part of ContrAlto.
+
+    ContrAlto is free software: you can redistribute it and/or modify
+    it under the terms of the GNU General Public License as published by
+    the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+
+    ContrAlto is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU General Public License for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with ContrAlto.  If not, see <http://www.gnu.org/licenses/>.
+*/
+
+using System.Collections.Generic;
 
 using Contralto.Memory;
 using Contralto.CPU;

Contralto/IO/Mouse.cs

@@ -1,9 +1,23 @@
-using Contralto.CPU;
+/*  
+    This file is part of ContrAlto.
+
+    ContrAlto is free software: you can redistribute it and/or modify
+    it under the terms of the GNU General Public License as published by
+    the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+
+    ContrAlto is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU General Public License for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with ContrAlto.  If not, see <http://www.gnu.org/licenses/>.
+*/
+
+using Contralto.CPU;
 using Contralto.Memory;
 using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
 using System.Threading;
 
 namespace Contralto.IO

Contralto/IO/Music.cs

@@ -1,12 +1,24 @@
-using Contralto.CPU;
+/*  
+    This file is part of ContrAlto.
+
+    ContrAlto is free software: you can redistribute it and/or modify
+    it under the terms of the GNU General Public License as published by
+    the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+
+    ContrAlto is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU General Public License for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with ContrAlto.  If not, see <http://www.gnu.org/licenses/>.
+*/
+
+using Contralto.CPU;
 using Contralto.Logging;
 using Contralto.Memory;
-using System;
-using System.Collections.Generic;
 using System.IO;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
 
 namespace Contralto.IO
 {

Contralto/IO/UDPEncapsulation.cs

@@ -1,4 +1,21 @@
-using System;
+/*  
+    This file is part of ContrAlto.
+
+    ContrAlto is free software: you can redistribute it and/or modify
+    it under the terms of the GNU General Public License as published by
+    the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+
+    ContrAlto is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU General Public License for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with ContrAlto.  If not, see <http://www.gnu.org/licenses/>.
+*/
+
+using System;
 using System.Net;
 using System.Net.Sockets;
 

Contralto/Logging/Log.cs

@@ -1,4 +1,21 @@
-#define LOGGING_ENABLED
+/*  
+    This file is part of ContrAlto.
+
+    ContrAlto is free software: you can redistribute it and/or modify
+    it under the terms of the GNU General Public License as published by
+    the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+
+    ContrAlto is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU General Public License for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with ContrAlto.  If not, see <http://www.gnu.org/licenses/>.
+*/
+
+#define LOGGING_ENABLED
 
 using System;
 using System.IO;
@@ -56,8 +73,8 @@ namespace Contralto.Logging
         static Log()
         {
             // TODO: make configurable
-            _components = LogComponent.CPU; // LogComponent.HostNetworkInterface | LogComponent.EthernetPacket; // | LogComponent.HostEthernet | LogComponent.EthernetController; // LogComponent.DiskController | LogComponent.DiskSectorTask | LogComponent.Debug | LogComponent.CPU; // LogComponent.EthernetController; // | LogComponent.Microcode | LogComponent.Memory | LogComponent.CPU;
-            _type = LogType.Normal | LogType.Warning | LogType.Error | LogType.Verbose;
+            _components = LogComponent.None; // LogComponent.HostNetworkInterface | LogComponent.EthernetPacket; // | LogComponent.HostEthernet | LogComponent.EthernetController; // LogComponent.DiskController | LogComponent.DiskSectorTask | LogComponent.Debug | LogComponent.CPU; // LogComponent.EthernetController; // | LogComponent.Microcode | LogComponent.Memory | LogComponent.CPU;
+            _type = LogType.None; // LogType.Normal | LogType.Warning | LogType.Error | LogType.Verbose;
 
             //_logStream = new StreamWriter("log.txt");
         }

Contralto/Memory/IMemoryMappedDevice.cs

@@ -1,5 +1,21 @@
-using System;
+/*  
+    This file is part of ContrAlto.
 
+    ContrAlto is free software: you can redistribute it and/or modify
+    it under the terms of the GNU General Public License as published by
+    the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+
+    ContrAlto is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU General Public License for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with ContrAlto.  If not, see <http://www.gnu.org/licenses/>.
+*/
+
+using System;
 using Contralto.CPU;
 
 namespace Contralto.Memory

Contralto/Memory/Memory.cs

@@ -1,4 +1,21 @@
-using Contralto.CPU;
+/*  
+    This file is part of ContrAlto.
+
+    ContrAlto is free software: you can redistribute it and/or modify
+    it under the terms of the GNU General Public License as published by
+    the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+
+    ContrAlto is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU General Public License for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with ContrAlto.  If not, see <http://www.gnu.org/licenses/>.
+*/
+
+using Contralto.CPU;
 using Contralto.Logging;
 
 namespace Contralto.Memory

Contralto/Memory/MemoryBus.cs

@@ -1,7 +1,23 @@
-using Contralto.CPU;
+/*  
+    This file is part of ContrAlto.
+
+    ContrAlto is free software: you can redistribute it and/or modify
+    it under the terms of the GNU General Public License as published by
+    the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+
+    ContrAlto is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU General Public License for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with ContrAlto.  If not, see <http://www.gnu.org/licenses/>.
+*/
+
+using Contralto.CPU;
 using System;
 using System.Collections.Generic;
-using System.IO;
 
 namespace Contralto.Memory
 {

Contralto/Program.cs

@@ -1,11 +1,24 @@
-using Contralto.CPU;
+/*  
+    This file is part of ContrAlto.
+
+    ContrAlto is free software: you can redistribute it and/or modify
+    it under the terms of the GNU General Public License as published by
+    the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+
+    ContrAlto is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU General Public License for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with ContrAlto.  If not, see <http://www.gnu.org/licenses/>.
+*/
+
 using Contralto.IO;
 using System;
-using System.Net;
 using System.Collections.Generic;
-using System.IO;
 using System.Windows.Forms;
-using System.Threading;
 
 namespace Contralto
 {

Contralto/Scheduler.cs

@@ -1,4 +1,20 @@
-using System;
+/*  
+    This file is part of ContrAlto.
+
+    ContrAlto is free software: you can redistribute it and/or modify
+    it under the terms of the GNU General Public License as published by
+    the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+
+    ContrAlto is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU General Public License for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with ContrAlto.  If not, see <http://www.gnu.org/licenses/>.
+*/
+
 using System.Collections.Generic;
 
 
@@ -14,7 +30,7 @@ namespace Contralto
     public delegate void SchedulerEventCallback(ulong timeNsec, ulong skewNsec, object context);
 
     /// <summary>
-    /// An Event represents a callback and associated context that is scheduled for a future timestamp.
+    /// An Event encapsulates a callback and associated context that is scheduled for a future timestamp.
     /// </summary>
     public class Event
     {

Contralto/UI/AboutBox.cs

@@ -1,11 +1,21 @@
-using System;
-using System.Collections.Generic;
-using System.ComponentModel;
-using System.Data;
-using System.Drawing;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
+/*  
+    This file is part of ContrAlto.
+
+    ContrAlto is free software: you can redistribute it and/or modify
+    it under the terms of the GNU General Public License as published by
+    the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+
+    ContrAlto is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU General Public License for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with ContrAlto.  If not, see <http://www.gnu.org/licenses/>.
+*/
+
+using System;
 using System.Windows.Forms;
 
 namespace Contralto

Contralto/UI/AlternateBootWindow.cs

@@ -1,11 +1,21 @@
-using System;
-using System.Collections.Generic;
-using System.ComponentModel;
-using System.Data;
-using System.Drawing;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
+/*  
+    This file is part of ContrAlto.
+
+    ContrAlto is free software: you can redistribute it and/or modify
+    it under the terms of the GNU General Public License as published by
+    the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+
+    ContrAlto is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU General Public License for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with ContrAlto.  If not, see <http://www.gnu.org/licenses/>.
+*/
+
+using System;
 using System.Windows.Forms;
 
 namespace Contralto

Contralto/UI/AltoWindow.cs

@@ -1,4 +1,21 @@
-using Contralto.CPU;
+/*  
+    This file is part of ContrAlto.
+
+    ContrAlto is free software: you can redistribute it and/or modify
+    it under the terms of the GNU General Public License as published by
+    the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+
+    ContrAlto is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU General Public License for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with ContrAlto.  If not, see <http://www.gnu.org/licenses/>.
+*/
+
+using Contralto.CPU;
 using Contralto.Display;
 using Contralto.IO;
 using Contralto.Properties;

Contralto/UI/Debugger.Designer.cs

@@ -1110,7 +1110,7 @@
             // label1
             // 
             this.label1.AutoSize = true;
-            this.label1.Location = new System.Drawing.Point(6, 678);
+            this.label1.Location = new System.Drawing.Point(6, 676);
             this.label1.Name = "label1";
             this.label1.Size = new System.Drawing.Size(85, 13);
             this.label1.TabIndex = 9;
@@ -1119,7 +1119,7 @@
             // ExecutionStateLabel
             // 
             this.ExecutionStateLabel.AutoSize = true;
-            this.ExecutionStateLabel.Location = new System.Drawing.Point(98, 678);
+            this.ExecutionStateLabel.Location = new System.Drawing.Point(98, 676);
             this.ExecutionStateLabel.Name = "ExecutionStateLabel";
             this.ExecutionStateLabel.Size = new System.Drawing.Size(33, 13);
             this.ExecutionStateLabel.TabIndex = 10;

Contralto/UI/Debugger.cs

@@ -1,19 +1,26 @@
-using System;
-using System.Collections.Generic;
-using System.ComponentModel;
-using System.Data;
+/*  
+    This file is part of ContrAlto.
+
+    ContrAlto is free software: you can redistribute it and/or modify
+    it under the terms of the GNU General Public License as published by
+    the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+
+    ContrAlto is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU General Public License for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with ContrAlto.  If not, see <http://www.gnu.org/licenses/>.
+*/
+
+using System;
 using System.Drawing;
-using System.Linq;
 using System.IO;
-using System.Text;
 using System.Windows.Forms;
 
 using Contralto.CPU;
-using System.Threading;
-using System.Drawing.Imaging;
-using Contralto.IO;
-using Contralto.Display;
-using Contralto.Logging;
 
 namespace Contralto
 {

Contralto/UI/SystemOptions.cs

@@ -1,13 +1,24 @@
-using Contralto.IO;
+/*  
+    This file is part of ContrAlto.
+
+    ContrAlto is free software: you can redistribute it and/or modify
+    it under the terms of the GNU General Public License as published by
+    the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+
+    ContrAlto is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU General Public License for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with ContrAlto.  If not, see <http://www.gnu.org/licenses/>.
+*/
+
+using Contralto.IO;
 using System;
 using System.Collections.Generic;
-using System.ComponentModel;
-using System.Data;
-using System.Drawing;
-using System.Linq;
 using System.Net.NetworkInformation;
-using System.Text;
-using System.Threading.Tasks;
 using System.Windows.Forms;
 
 namespace Contralto.UI

Contralto/readme.txt

@@ -30,18 +30,18 @@ keyset input device.
 2.0 Requirements
 ================
 
-ContrAlto will run on any Windows PC running Windows XP or later, with version
-2.0 or later of the .NET Framework installed.  .NET should be present by default
+ContrAlto will run on any Windows PC running Windows Vista or later, with version
+4.5 or later of the .NET Framework installed.  .NET should be present by default
 on Windows Vista and later; if it is not installed on your computer it can be
 obtained at https://www.microsoft.com/net.
 
 As ContrAlto is a .NET application and has no Windows-specific dependencies,
 it will also run under Mono (http://www.mono-project.com/) on Unix and MacOS, 
-however this usage is not as well tested -- please file bugs if you find them 
-(see Section 7 for details).
+however this usage has many rough edges at the moment -- please file bugs if 
+you find them (see Section 7 for details).
 
 A three-button mouse is essential for using most Alto software.  On most mice,
-the "mousewheel" can be clicked to provide the third (middle) button.  Laptops
+the mousewheel can be clicked to provide the third (middle) button.  Laptops
 with trackpads may have configuration options to simulate three buttons but
 will likely be clumsy to use.
 
@@ -49,6 +49,16 @@ will likely be clumsy to use.
 3.0 Getting Started
 ===================
 
+Installation of ContrAlto is simple:  Double-click the installer file, named 
+"ContraltoSetup.msi" and follow the on-screen instructions.  The installer
+will install all of the necessary files and create two icons on your Start menu,
+one for ContrAlto itself, and one for its documentation (the file you're reading
+now!)
+
+
+3.1 Getting Started
+===================
+
 To launch ContrAlto, simply click on the shortcut created by the installer
 on your Start Menu (or Start Screen, depending on your Windows version.)  Two
 windows will appear: a console window for diagnostic output and the main display
@@ -144,16 +154,15 @@ when a new image is loaded or when ContrAlto exits.  For this reason it may be
 a good idea to make backups of packs from time to time (just like on the real
 machine.)
 
-ContrAlto comes with a set of disk packs containing an assortment of Alto 
-programs, these can be found in your "Documents" folder, in the 
-"ContrAlto Disks" subfolder.  These are:
+ContrAlto does not come with any disk images, however an assortment of Alto 
+programs can be found on Bitsavers.org, at 
+http://www.bitsavers.org/bits/Xerox/Alto/disk_images/.  Images include:
 
-AllGames.dsk   -  A collection of games for the Alto
+AllGames.dsk   -  A collection of games and toys for the Alto
 Bcpl.dsk       -  A set of BCPL development tools
-Diag.dsk       -  Diagnostic tools
+Diags.dsk      -  Diagnostic tools
 NonProg.dsk    -  The "Non-Programmer's Disk," containing Bravo
-ST76.dsk       -  Smalltalk-76
-XmST76.dsk44   -  Another Smalltalk-76, with sources and space to play.
+Xmsmall.dsk    -  Smalltalk-76
 
 
 3.1.4 Startup, Reset and Shutdown
@@ -375,7 +384,7 @@ ROM1 contains the listing for the Mesa 5.0 microcode ROMs.
 5.3 Memory Pane
 ---------------
 
-The pane near the lower-left (labeled "Memory") shows a view into the main
+The pane near the top-middle (labeled "System Memory") shows a view into the main
 memory of the Alto, providing address/data and a machine-generated disassembly 
 of Alto (Nova) instructions.
 
@@ -396,8 +405,6 @@ in the Emulator task.
 
 The other panes in the debugger are:
 
-Disk:    Shows registers and other status of the disk hardware.
-
 Tasks:   Shows the current microcode task status.  The "T" column indicates the
          task name, "S" indicates the status ("W"akeup and "R"unning), and the
          "uPC" column indicates the micro-PC for the corresponding task.  There
@@ -435,8 +442,16 @@ with "ContrAlto Bug".
 When you send a report, please be as specific and detailed as possible:
 - What issue are you seeing?
 - What Alto software are you running?
+- What operating system are you running ContrAlto on?
 - What are the exact steps needed to reproduce the issue?
 
 The more detailed the bug report, the more possible it is for me to track down
 the cause.
 
+
+8.0 Thanks and Acknowledgements
+===============================
+
+ContrAlto would not have been possible without the amazing preservation work of 
+Bitsavers.org and the Computing History Museum.
+

ContraltoSetup/Product.wxs

@@ -1,4 +1,21 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!--
+  This file is part of ContrAlto.
+
+  ContrAlto is free software: you can redistribute it and/or modify
+  it under the terms of the GNU General Public License as published by
+  the Free Software Foundation, either version 3 of the License, or
+  (at your option) any later version.
+
+  ContrAlto is distributed in the hope that it will be useful,
+  but WITHOUT ANY WARRANTY; without even the implied warranty of
+  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+  GNU General Public License for more details.
+
+  You should have received a copy of the GNU General Public License
+  along with ContrAlto.  If not, see <http://www.gnu.org/licenses/>.
+-->
+
 <Wix xmlns="http://schemas.microsoft.com/wix/2006/wi">
 	<Product Id="CE5F3D08-3BD6-4BDF-9C64-0C2B852B899C" Name="ContrAlto" Language="1033" Version="1.0.0.0" Manufacturer="Living Computer Museum" UpgradeCode="38d6b09f-6e7b-4854-844a-5d4ab707a357">
 		<Package Id="*" InstallerVersion="200" Compressed="yes" InstallScope="perMachine" />
@@ -12,8 +29,8 @@
       <ComponentGroupRef Id="MicrocodeComponentsShared" />
       <ComponentGroupRef Id="MicrocodeComponentsAltoI" />
       <ComponentGroupRef Id="MicrocodeComponentsAltoII" />
-      <ComponentRef Id="UserDiskFolder"/>
-      <ComponentGroupRef Id="DiskComponents" />      
+      <!-- for disk packs, currently removed <ComponentRef Id="UserDiskFolder"/> 
+      <ComponentGroupRef Id="DiskComponents" /> -->
       <ComponentGroupRef Id="CodeComponents" /> 
       <ComponentRef Id="ProgramMenuDir" />
 		</Feature>
@@ -50,6 +67,7 @@
               </Component>
           </Directory>
       </Directory>
+      <!-- For disk packs (removed for now)
       <Directory Id="PersonalFolder">
         <Directory Id="DISKFOLDER" Name="ContrAlto Disks">
           <Component Id="UserDiskFolder" Guid="007ADB59-BCE4-43CB-9AEC-DD5962136A7E">
@@ -57,7 +75,7 @@
               <RegistryValue Root="HKCU" Key="Software\Living Computer Museum\ContrAlto" Type="string" Value="" KeyPath="yes" />
           </Component>
         </Directory>
-      </Directory>
+      </Directory> -->
 		</Directory>
   </Fragment>
 
@@ -161,8 +179,8 @@
       </Component>
     </ComponentGroup>
     
-    <ComponentGroup Id="DiskComponents" Directory="DISKFOLDER">
-      <!-- Disk Images: Not removed during uninstall -->
+    <!-- for disk images (not included at this time)
+    <ComponentGroup Id="DiskComponents" Directory="DISKFOLDER">      
       <Component Id="DiskImages" Guid="A0977605-CD44-462D-80A0-A6347D87B700" Permanent="yes">
         <RegistryValue Root="HKCU" Key="Software\Living Computer Museum\ContrAlto"
                      Name="InstallFolder"
@@ -177,7 +195,7 @@
         <File Id="st80" Name="ST80.dsk" Source="$(var.Contralto.TargetDir)\Disk\st80.dsk"/>      
         <File Id="xmsmall" Name="XmST76.dsk44" Source="$(var.Contralto.TargetDir)\Disk\xmst76.dsk44"/>
       </Component>
-    </ComponentGroup>
+    </ComponentGroup> -->
 
     <ComponentGroup Id="CodeComponents" Directory="DISASSEMBLYFOLDER">
       <!-- Annotated disassemblies -->