Reorganized all of the files in the solution.
Fix a bug with zero-width detection.