Using latest makefile template.
Renamed various structures and other internal refactorings.
Renamed primary configuration method names.
Adjusting visibility.