Removed core classes, added FileSelectorQ