Directory structure changes and README updates