Moved templates. Misc updates. Testing.