Structure change and README update