Whitespace/Normalize/Buffduration fix

redoing last commit without the stupid double folders