file locations changed a bit to make more sense