Update README, relocate some source files
Fixed README merge