Use a more standard folder structure