BUGFIX: Add Layout folder and move templates to it