Cleaning up MainClasses. Not finished.
Rewritting the main script to execute all again.