Move file locations
Refactor OS dependencies start