Reorganized site structure to allow for moduler development