A few small changes, before main panel.js refactor
Code cleaning part 2
including renamed file