Move L1 code to subdirs