Another package refactoring, fixing windows aux foulder issue