fix weird file locations
cleanup