remove some old junk
restructure files