re-organized and added test directory