WIP: continue restructure of modules.lxc