Classes are now separated in package