New folder organization proposal and update readme.md instrcutions

This is just a proposal to be discussed.