Restructured template files & added modman