major restructuring

Just need the links to work.