Adjust folder structure to new namespace