Update project and remove commong project to separated jar