fix file layout and update shirt contents