Switch to slim templates and change folder structure