Merged in changes from the work done for the demonstration and reorganized the SWIG files so that they wouldn't be counted in the line tally.