initial file restructuring