**Kwarg Fix, Finished Separation

Fixed kwargs to make better use of it. Moved the last of the functional
parts to own files. Renamed packages/modules to better reflect their
function.