Attempting to fix directory locations for build/install