feature detection
cleaned up file placement