removed some old stuff, renamed the rest