Update Info

Updated file info and made sure files are organized