Simplify project structure and sanitize JSON