moved step 2 code back into step 2 template, created separate dirs for each report type, modified report type enums to match report type dirs, moved work order status and period code into separate template, updated reports controller step 1, 2, and 3 methods, and updated en and fr message.properties