diff --git a/LICENSE b/LICENSE
index 050b84b46c6af0107c3f4f027ce4d09415737c0d..00145602a19579c31c7cde60b476fa4237e3610c 100644
--- a/LICENSE
+++ b/LICENSE
@@ -1,13 +1,84 @@
-pymolfile
+LICENSE for pymolfile
+---------------------
 
-	GNU GENERAL PUBLIC LICENSE Version 2, Copyright © 2017 Berk Onat
+All files of pymolfile except the files under vmd_molfile_plugins directory 
+which are licensed below after "LICENSE for VMD molfile_plugins" is licensed under
+with the following UIUC Open Source License:
+-----------------------------------------------------------------------------
 
-	applies to all files unless otherwise noted
+University of Illinois Open Source License
+Copyright 2017 University of Warwick 
+All rights reserved.
 
+Developed by:		Berk Onat, James R. Kermode at Warwick Center of Predictive Modelling
+			University of Warwick
+			https://www2.warwick.ac.uk/fac/sci/wcpm
 
-VMD molfile_plugins
+Permission is hereby granted, free of charge, to any person obtaining a copy of
+this software and associated documentation files (the Software), to deal with 
+the Software without restriction, including without limitation the rights to 
+use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies 
+of the Software, and to permit persons to whom the Software is furnished to 
+do so, subject to the following conditions:
+
+Redistributions of source code must retain the above copyright notice, 
+this list of conditions and the following disclaimers.
+
+Redistributions in binary form must reproduce the above copyright notice, 
+this list of conditions and the following disclaimers in the documentation 
+and/or other materials provided with the distribution.
+
+Neither the names of Warwick Center of Predictive Modelling, 
+University of Warwick, nor the names of its contributors 
+may be used to endorse or promote products derived from this Software without 
+specific prior written permission.
+
+THE SOFTWARE IS PROVIDED AS IS, WITHOUT WARRANTY OF ANY KIND, EXPRESS OR 
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, 
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL 
+THE CONTRIBUTORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR 
+OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, 
+ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR 
+OTHER DEALINGS WITH THE SOFTWARE.
+
+
+
+LICENSE for VMD molfile_plugins
+-------------------------------
+
+University of Illinois Open Source License
+Copyright 2006 Theoretical and Computational Biophysics Group, 
+All rights reserved.
+
+Developed by:		Theoretical and Computational Biophysics Group
+			University of Illinois at Urbana-Champaign
+			http://www.ks.uiuc.edu/
+
+Permission is hereby granted, free of charge, to any person obtaining a copy of
+this software and associated documentation files (the Software), to deal with 
+the Software without restriction, including without limitation the rights to 
+use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies 
+of the Software, and to permit persons to whom the Software is furnished to 
+do so, subject to the following conditions:
+
+Redistributions of source code must retain the above copyright notice, 
+this list of conditions and the following disclaimers.
+
+Redistributions in binary form must reproduce the above copyright notice, 
+this list of conditions and the following disclaimers in the documentation 
+and/or other materials provided with the distribution.
+
+Neither the names of Theoretical and Computational Biophysics Group, 
+University of Illinois at Urbana-Champaign, nor the names of its contributors 
+may be used to endorse or promote products derived from this Software without 
+specific prior written permission.
+
+THE SOFTWARE IS PROVIDED AS IS, WITHOUT WARRANTY OF ANY KIND, EXPRESS OR 
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, 
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL 
+THE CONTRIBUTORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR 
+OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, 
+ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR 
+OTHER DEALINGS WITH THE SOFTWARE.
 
-	DCD reading code originally derived from VMD's catdcd
-	http://www.ks.uiuc.edu/Development/MDTools/catdcd/
-	http://www.ks.uiuc.edu/Development/MDTools/catdcd/license.html
 
diff --git a/pymolfile/molfile/libpymolfile.i b/pymolfile/molfile/libpymolfile.i
index a9deaee60b586259c1c8083282d83bf1884ecdee..e858607bcd8dcac49060aa144ac6cc507cb44e2e 100644
--- a/pymolfile/molfile/libpymolfile.i
+++ b/pymolfile/molfile/libpymolfile.i
@@ -1,15 +1,15 @@
 /* -*- C -*-  (not really, but good for syntax highlighting) */
-/* SWIG interface for libvmdmolfile of VMD molfile_plugins
+/* SWIG interface for libpymolfile of VMD molfile_plugins
    Copyright (c) 2017 Berk Onat <b.onat@warwick.ac.uk>
-   Published under BSD LICENSE
+   Published under UIUC LICENSE
 
-   swig -python -outdir pymolfile/lib/ pymolfile/src/libpymolfile.i
+   swig -c++ -python -outdir . molfile/libpymolfile.i
 */
 %define DOCSTRING
 "
 :Author:  Berk Onat <b.onat@warwick.ac.uk>
 :Year:    2017
-:Licence: BSD LICENSE
+:Licence: UIUC LICENSE
 
 
 "