changes for night

helped with organization by adding more classes that will be created and
extending other classes from what they are suppoesd to be from