Changed directory structure, updated README.md