Simplify class structure - closes #15