More changes.. Less folders