just reorganize folders slightly