Adjust folder structure
Fix a crash after adjusting folder structure