renamed main class
New structure