Reorgaize gem layout and update copyright year