Changed folder hierarchy.
Fixed README