Changed Format

Changed format of folders to improve first-read understandability (if
that makes sense).