Updates, removes some old stuff, simplified structure.