Solve "wiggle" problem and string comparisons.

Also add some directory structure.