Clean workspace

and make the model consistent with the paper...
only aspect oriented modeling is missing