added a test directory
reorganized packages and files