reorganized files, edited little code -KL