Updated: README.md + some changes to folder structure