Added logger
Put classes  in their own folder