Refactor install location