This is the new dir tree

Should work for now!