Correct dependency specification
Add stage1.5 build rules (fill them in, shikhin!). move stage1 build rules to their folder