clean up templates dir, move stuff out of 'innov' folder