Add in options to alias file for code, data and files
Abstract code pull and clean up