Feature/refactor l2c

Big rename/merge...