Organize directory structure for consistency.
Credit to Chris Zetter for original code