Put os variants into back into os folders
Rewrote file locations