Updates to file placement, & index