Make file location organized