Started modifying paths for multiplatform