Started to rework the folder structure