reorganized directories, added testing structure