moved and renamed main class