Refactor: class moved + copyright deleted