Use a more conventional /app folder structure
merge