Re-organize directory and update .gitignore.