reorganized files
added TODO