Separated Files 

Updated file format