Reorganize

Reorganize into a consistent format for the classes and methods, along with the calls for parallel processing.