update commonplace, commonplace modules in own dir (bug 949547)