Major file restructuring