Fix compilation and move files to the right place.