Refactored. Classes are now in packages according to their type.