Moved each class into it's own library file