Changes to README and project structure