moved tests around, cleaned up root dir