Reorganize for better instlalation