Organizing things better. Much refactoring.