Restructuring

Starting back on things. Just a minor commit, restructuring data
classes.