Structure changes and Readme