reorganized files, fixed semicolons