removed obsolete files
merging hell
adding template, again