Start minor file breakup, fix file dir finding