cleaned up directory structure

last part of main KIPR routine ad more changes to come for create