Added main class, added packages