Made file structures less deep for dumb Hammer