Starting to take shape, file restructuring