Provides clean up and ordering change of parameters to reduce dependency

on un-created directories.