Changed to a more verbose directory format.

Also replaced the double newline to a
single one.