Minor edits

Cleaned file hierarchy, &c.