jlo: move specific files to common