Tidying up site structure

Such organized. Much optimised.