Moving things around a bit and adding minimal documentation