Massive reorganization

Moving everything into round is harder than I thought.