file restructuring + secure expression parser