Added and changed some classes and files