Organized the stuff in groups

lawl