Use the right folders...