refactor layout and add new copyright/license