Move toward a less verbose folder structure