renamed classes and interfaces
Structure into packages