reorganized files and finished I8