Adding flags for file directories.

Also cleaned up the formatting a bit.