Move step 1 into its own directory
Construct new formula type for step 2