Re-org source paths