File Structure Change

sorted out the file structure