Adjust folder structure and widget config