Start using Config and Template
Changed File-Structure