Partial restructuring

Moving towards grouping functionality more intuitively.