FIX: Fix image [ci skip]
FIX: Reorganize