Revert "Final commit of from template version, Fixed wrong directory (incomplete before)"

This reverts commit c192a3e4a97be69c932512d20f8b9459812860fb.