Bootstrap location refactor