massively changed everything

following restructure suggestions by hans and aptricia