include template in theme and adjusted code acordingly
moved files