reorganized files, bugs found, changes to come