Changed and reorganized EVERYTHING