Organizing code structure, changing copyrights