seperated to folders & fixed YagoFileHandler