move files to right location, fix tests