Move more PHP to src