reorganized files, updated code to reflect that.