Move main out of package of one
Remove empty class