Refactoring. Adding copyrights info and NON-NLS