Clead up with new sub folders