AI-661 - separated workspace and folder place