[ Delivers #64528988 ] Major reorganization of code including a split into three source files.