Use consistent method of sourcing other files