Updated README and folder structure