Moved files to allow for easier updates to Foundation