general clean up
rename MainClass to StartClass