restructure project
fix basic templating