Splitted some classes
Splitted some classes in files