Move substrate stuff in substrate dir
Update READMEs