refactor folders into mod friendly format