Fix "Open Files" bug in Linux
Rearrange files (best cohesion)