Added some more files to the new file structure