Adjust folder structure for resources and tests