Split fileset subclasses into its own classes