Fix folder structure

Fixing what I broke :-/