Adjust licence wording, major code refactoring