Better folder structure and updated README.