Added main class and remaned package.