changed package names and organization
clean up