Minor fixes in the code layout. Updated readme.