Reorganize and add X-ray

The directory is also changed.