flaten the extras projects into smaller sub projects
fix swagger demo