Several improvements on structure and README