Match User's Manual

Main is cleaned and ordered to flow with the User's Manual in readme.