Rearange files. Fix README.md