Added template-folder, cleaned files
