Changed directory structure and updated README.md