Separated suggestions outside of the lib directory.
Merge branch 'separate-suggestions'