Updated to fit new /app/ directory structure