Renaming folder etc -> data.
Adding a work comment for Xou.