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

This reverts commit 95b0770c35a1928235daffb754bf9489f273a9ac.