Updated source files to include Apache license text
Make rename refactoring more robust
Improved quit and close functionality