updated structure to match website