Bit of a cleanup with folders