Fixing missing files that somehow got loss in the big merge yesterday from Bryan's commit
Cleaning up just a bit more; moved forms.jar to the lib folder, etc.