Refactored hotel classes into subpackage