Organized file locations list
Removed string + some refactoring
Cleaned up the file locations list