Ensured files are loaded into arraylist in correct order; got rid of
some deprecated code.