Changed folder structure and edited .gitignore.