Update project according to new convention.
Always using Net-4.0.
Update submodule