Jas 95 / Unfinished

To move forward with this task I prefer to have the structure modernized so I will switch to #96 but I don't want to stay away from master branch too long.