fixed template and static folder structure
merging remote changes