Fixed ex handling.
New files structure