More reorganization of files, added testing