Major reorganization of files and document
Minor tweak