File Restructure

Minor update