Changed folder structure, update README.