Update file structure to last commit on Framework