Refactored files locations