reduce folders, add dependencies