added addtional attributes
converted files to new template