reorganized some files into proper folders