removed old files, renamed test dirs