Move main class to own class file