streamline directory structure