Reorganize

This is the final reorganized model 

All scripts work and documentation is updated except for documentation of calibration  procedures