New dir structure and README