styling, BIG CHANGES to structure and organization