Reorganized source tree and VS projects