Added debug performance timer, reorganized src