Update to Readme file and changes to directory layout.