chore: merge cleaned project structure with full history