Was sourcing files in the wrong order