Reorganization and README update