Moved file data classes into separate directory