Restructure project, add tema3 folder and initial work