File structure changes and README update