some minor fixes: put files in proper place