Not sure why you made this the fallback. This is the way we want to go in the future, so the old folder structure has to be the fallback.