Bring more consistentcy to the app folder structure