Tried to fix hammer again and reorganized some classes