Square into Triangle Puzzle

This puzzle is based on the dissection of a square into four pieces which can be rearranged to form a triangle. Given the four pieces the problem is to assemble them into first a square tray and second into a triangular tray.

This is a revisit to the Haberdasher Puzzle: http://www.thingiverse.com/thing:1457184. It was redone to be uniform with puzzles described in thing:1481244 and thing:1492552. All the square boxes for these puzzles are the same size so that multiple puzzles can be combined to make the solutions more difficult.