New take on content dir