Changed folder structure.

Also updated .gitignore.