fixed RewriteCDF
Moved dependencies out of sub-folder