Refactored: package name and some classes fields.