Moved inline templates into separate files