New folder organization proposal and update readme.md instrcutions