New directory structure because stuff was getting annoying.