Did some refactoring: Structure and field modifiers. Started adding tests.