Reworked Structure, pruned old stuff