Fix

Code organisation