Added old base template
Several changes done to folder structure