Added JaMoPP stuff and refactored code into bases classes