Updated GNU License, minor refactoring of class/method names