Refactor name and location of app requirements types