reorganize file structure per Kevin