Fixed #5. Gathering files to improve performance