Restructure and stability work
fix changing relative path to absolute under non-unix OS