fixed template issue + moved/renamed files