reorganized and cleaned source and installation