Removed main and merge into MainApplication