Adjust lapack path
Reorganize to be clearer