Syntax and major changes

Herein adherence changes to the main branch, with respect to a further
file change and re-organization.