stubbed out testing, renamed some files