clean up dirs, second template finalized and live