Revert "move most of the ace files to the dependency file"

This reverts commit 1288f2133c21dda1bb2d4af9e14838e85452705c.