Removed lister, loaded files in the right order