Minor Updates
Major Reorganization

Moved functions around and added par.R,