Changed MainClass & Main Func Defn to be separate