re-arrange fixtures and templates