cleaned up structure, broke everything