moving layouts back to app folder to avoid css problems