More changes to layout, cleaning folders