[~TASK] Some restructuring