moved fileLoader
review fixes