Organized and improved code style

This were just too much lines in one file, sorry :D
Always one file missing Kappa
All those small changes....
KappaHD
Updated to 4.21

Kappa, that's all I can say now