Reworked file locations