Refactored classes into individual files.