Updated settings and folder layout