Moved classes into individual files