'move functions into other files'
merging changes